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

GATIT IOS 13适配,新框架适配。

Ray Zhang пре 6 година
родитељ
комит
134487f061

+ 118 - 44
RedAnt ERP Mobile/HMLG Mobile.xcodeproj/project.pbxproj

@@ -7,6 +7,32 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		3C7C791F23F66821003F4342 /* ERP_Mobile_Model.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C791823F66821003F4342 /* ERP_Mobile_Model.storyboard */; };
+		3C7C792023F66821003F4342 /* ERP_Mobile_Contact.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C791923F66821003F4342 /* ERP_Mobile_Contact.storyboard */; };
+		3C7C792123F66821003F4342 /* ERP_Mobile_Cart.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C791A23F66821003F4342 /* ERP_Mobile_Cart.storyboard */; };
+		3C7C792223F66821003F4342 /* ERP_Mobile_Discard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C791B23F66821003F4342 /* ERP_Mobile_Discard.storyboard */; };
+		3C7C792323F66821003F4342 /* ERP_Mobile_Search.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C791C23F66821003F4342 /* ERP_Mobile_Search.storyboard */; };
+		3C7C792423F66821003F4342 /* ERP_Mobile_Portfolio.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C791D23F66821003F4342 /* ERP_Mobile_Portfolio.storyboard */; };
+		3C7C792523F66821003F4342 /* ERP_Mobile_Order.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C791E23F66821003F4342 /* ERP_Mobile_Order.storyboard */; };
+		3C7C792B23F66853003F4342 /* wkweb.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C792623F66852003F4342 /* wkweb.storyboard */; };
+		3C7C792C23F66853003F4342 /* WebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C7C792723F66853003F4342 /* WebViewController.m */; };
+		3C7C792D23F66853003F4342 /* RAPDFViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C7C792923F66853003F4342 /* RAPDFViewController.m */; };
+		3C7C793123F6689D003F4342 /* ytplayer.html in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C792E23F6689D003F4342 /* ytplayer.html */; };
+		3C7C793223F6689D003F4342 /* RAYTPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C7C792F23F6689D003F4342 /* RAYTPlayer.m */; };
+		3C7C793523F668EC003F4342 /* PortfolioListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C7C793423F668EC003F4342 /* PortfolioListTableViewCell.m */; };
+		3C7C793723F6695B003F4342 /* CommonEditor.iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C793623F6695B003F4342 /* CommonEditor.iPad.xib */; };
+		3C7C793923F66961003F4342 /* CommonEditor.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C793823F66960003F4342 /* CommonEditor.storyboard */; };
+		3C7C794523F66992003F4342 /* iPadCommonEditorCellAction.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C793A23F66991003F4342 /* iPadCommonEditorCellAction.xib */; };
+		3C7C794623F66992003F4342 /* iPadCommonEditorCellSwitch.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C793B23F66992003F4342 /* iPadCommonEditorCellSwitch.xib */; };
+		3C7C794723F66992003F4342 /* iPadCommonEditorCellImg.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C793C23F66992003F4342 /* iPadCommonEditorCellImg.xib */; };
+		3C7C794823F66992003F4342 /* iPadCommonEditorCellEnum.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C793D23F66992003F4342 /* iPadCommonEditorCellEnum.xib */; };
+		3C7C794923F66992003F4342 /* iPadCommonEditorCellLabel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C793E23F66992003F4342 /* iPadCommonEditorCellLabel.xib */; };
+		3C7C794A23F66992003F4342 /* iPadCommonEditorCellMAction.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C793F23F66992003F4342 /* iPadCommonEditorCellMAction.xib */; };
+		3C7C794B23F66992003F4342 /* CommonEditorViewControlleriPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C794023F66992003F4342 /* CommonEditorViewControlleriPad.xib */; };
+		3C7C794C23F66992003F4342 /* iPadCommonEditorCellTextView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C794123F66992003F4342 /* iPadCommonEditorCellTextView.xib */; };
+		3C7C794D23F66992003F4342 /* iPadCommonEditorCellModel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C794223F66992003F4342 /* iPadCommonEditorCellModel.xib */; };
+		3C7C794E23F66992003F4342 /* iPadCommonEditorCellEdit.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C794323F66992003F4342 /* iPadCommonEditorCellEdit.xib */; };
+		3C7C794F23F66992003F4342 /* iPadCommonEditorCellSignature.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C794423F66992003F4342 /* iPadCommonEditorCellSignature.xib */; };
 		423CC87121D22F87008BD2C4 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 423CC87021D22F87008BD2C4 /* Launch Screen.storyboard */; };
 		428980011E24902E005F1BD8 /* JKTimerManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 428980001E24902E005F1BD8 /* JKTimerManager.m */; };
 		428980071E2490E3005F1BD8 /* NotificationNameCenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 428980061E2490E3005F1BD8 /* NotificationNameCenter.m */; };
@@ -58,7 +84,6 @@
 		42BEF39B1E8A4C7D00632AB6 /* GoogleAnalyst.m in Sources */ = {isa = PBXBuildFile; fileRef = 42BEF37D1E8A4C7D00632AB6 /* GoogleAnalyst.m */; };
 		42BEF39C1E8A4C7D00632AB6 /* libGoogleAnalytics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42BEF3801E8A4C7D00632AB6 /* libGoogleAnalytics.a */; };
 		42BEF39D1E8A4C7D00632AB6 /* GTMNSData+zlib.m in Sources */ = {isa = PBXBuildFile; fileRef = 42BEF38F1E8A4C7D00632AB6 /* GTMNSData+zlib.m */; };
-		42BEF39E1E8A4C7D00632AB6 /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = 42BEF3911E8A4C7D00632AB6 /* LICENSE */; };
 		42BEF39F1E8A4C7D00632AB6 /* README.md in Sources */ = {isa = PBXBuildFile; fileRef = 42BEF3921E8A4C7D00632AB6 /* README.md */; };
 		42BEF3A21E8A4D0000632AB6 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42BEF3A11E8A4D0000632AB6 /* SystemConfiguration.framework */; };
 		42BEF3A41E8A4D0700632AB6 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42BEF3A31E8A4D0700632AB6 /* CoreData.framework */; };
@@ -139,8 +164,6 @@
 		7183E9221CF29F4500524787 /* ScanApiHelper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7183E8F81CF29F4500524787 /* ScanApiHelper.mm */; };
 		7183E9231CF29F4500524787 /* softScanBeep.wav in Resources */ = {isa = PBXBuildFile; fileRef = 7183E8FA1CF29F4500524787 /* softScanBeep.wav */; };
 		7183E9241CF29F4500524787 /* include in Resources */ = {isa = PBXBuildFile; fileRef = 7183E8FB1CF29F4500524787 /* include */; };
-		7183E9E21CF29FCB00524787 /* RAPDFViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7183E9291CF29FCB00524787 /* RAPDFViewController.m */; };
-		7183E9E31CF29FCB00524787 /* WebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7183E92B1CF29FCB00524787 /* WebViewController.m */; };
 		7183E9E41CF29FCB00524787 /* AddressEditorViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7183E92E1CF29FCB00524787 /* AddressEditorViewController.m */; };
 		7183E9E51CF29FCB00524787 /* CycleScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7183E9311CF29FCB00524787 /* CycleScrollView.m */; };
 		7183E9E61CF29FCB00524787 /* NSTimer+Addition.m in Sources */ = {isa = PBXBuildFile; fileRef = 7183E9331CF29FCB00524787 /* NSTimer+Addition.m */; };
@@ -198,7 +221,6 @@
 		7183EA1A1CF29FCB00524787 /* OrderListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7183E9A01CF29FCB00524787 /* OrderListViewController.m */; };
 		7183EA1B1CF29FCB00524787 /* status_filter_cadedate_open.json in Resources */ = {isa = PBXBuildFile; fileRef = 7183E9A11CF29FCB00524787 /* status_filter_cadedate_open.json */; };
 		7183EA1D1CF29FCB00524787 /* OrderDetailSignatureCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7183E9A41CF29FCB00524787 /* OrderDetailSignatureCell.m */; };
-		7183EA1E1CF29FCB00524787 /* PDFListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7183E9A71CF29FCB00524787 /* PDFListTableViewCell.m */; };
 		7183EA1F1CF29FCB00524787 /* PortfolioListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7183E9A91CF29FCB00524787 /* PortfolioListViewController.m */; };
 		7183EA201CF29FCB00524787 /* PortfolioViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7183E9AB1CF29FCB00524787 /* PortfolioViewController.m */; };
 		7183EA211CF29FCB00524787 /* TearSheetParamViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7183E9AD1CF29FCB00524787 /* TearSheetParamViewController.m */; };
@@ -249,9 +271,6 @@
 		71AD1E0A1D3E039E008B7685 /* SyncControlPanelViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71AD1E091D3E039E008B7685 /* SyncControlPanelViewController.m */; };
 		71BF07011D2F3CCC00981938 /* OLDataProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 71BF07001D2F3CCC00981938 /* OLDataProvider.m */; };
 		71BF07051D2F3CF300981938 /* OfflineSettingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71BF07041D2F3CF300981938 /* OfflineSettingViewController.m */; };
-		71C1D8111F45556200CEA1C9 /* Assets.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 71C1D80B1F45556200CEA1C9 /* Assets.bundle */; };
-		71C1D8121F45556200CEA1C9 /* YTPlayerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 71C1D80E1F45556200CEA1C9 /* YTPlayerView.m */; };
-		71C1D8131F45556200CEA1C9 /* YTViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71C1D8101F45556200CEA1C9 /* YTViewController.m */; };
 		71C1D8181F45564000CEA1C9 /* ContentPreviewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71C1D8171F45564000CEA1C9 /* ContentPreviewController.m */; };
 		71C1D8201F45574200CEA1C9 /* PhotoList.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 71C1D81F1F45574200CEA1C9 /* PhotoList.storyboard */; };
 		71C1D8251F45574B00CEA1C9 /* PhotoPreviewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 71C1D8221F45574B00CEA1C9 /* PhotoPreviewCell.m */; };
@@ -260,6 +279,36 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		3C7C791823F66821003F4342 /* ERP_Mobile_Model.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = ERP_Mobile_Model.storyboard; path = common/ERP_Mobile_Model.storyboard; sourceTree = SOURCE_ROOT; };
+		3C7C791923F66821003F4342 /* ERP_Mobile_Contact.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = ERP_Mobile_Contact.storyboard; path = common/ERP_Mobile_Contact.storyboard; sourceTree = SOURCE_ROOT; };
+		3C7C791A23F66821003F4342 /* ERP_Mobile_Cart.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = ERP_Mobile_Cart.storyboard; path = common/ERP_Mobile_Cart.storyboard; sourceTree = SOURCE_ROOT; };
+		3C7C791B23F66821003F4342 /* ERP_Mobile_Discard.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = ERP_Mobile_Discard.storyboard; path = common/ERP_Mobile_Discard.storyboard; sourceTree = SOURCE_ROOT; };
+		3C7C791C23F66821003F4342 /* ERP_Mobile_Search.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = ERP_Mobile_Search.storyboard; path = common/ERP_Mobile_Search.storyboard; sourceTree = SOURCE_ROOT; };
+		3C7C791D23F66821003F4342 /* ERP_Mobile_Portfolio.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = ERP_Mobile_Portfolio.storyboard; path = common/ERP_Mobile_Portfolio.storyboard; sourceTree = SOURCE_ROOT; };
+		3C7C791E23F66821003F4342 /* ERP_Mobile_Order.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = ERP_Mobile_Order.storyboard; path = common/ERP_Mobile_Order.storyboard; sourceTree = SOURCE_ROOT; };
+		3C7C792623F66852003F4342 /* wkweb.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = wkweb.storyboard; path = "../../common/WK PDF+Web/wkweb.storyboard"; sourceTree = "<group>"; };
+		3C7C792723F66853003F4342 /* WebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WebViewController.m; path = "../../common/WK PDF+Web/WebViewController.m"; sourceTree = "<group>"; };
+		3C7C792823F66853003F4342 /* RAPDFViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RAPDFViewController.h; path = "../../common/WK PDF+Web/RAPDFViewController.h"; sourceTree = "<group>"; };
+		3C7C792923F66853003F4342 /* RAPDFViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAPDFViewController.m; path = "../../common/WK PDF+Web/RAPDFViewController.m"; sourceTree = "<group>"; };
+		3C7C792A23F66853003F4342 /* WebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebViewController.h; path = "../../common/WK PDF+Web/WebViewController.h"; sourceTree = "<group>"; };
+		3C7C792E23F6689D003F4342 /* ytplayer.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = ytplayer.html; path = ../../common/Youtube/ytplayer.html; sourceTree = "<group>"; };
+		3C7C792F23F6689D003F4342 /* RAYTPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAYTPlayer.m; path = ../../common/Youtube/RAYTPlayer.m; sourceTree = "<group>"; };
+		3C7C793023F6689D003F4342 /* RAYTPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RAYTPlayer.h; path = ../../common/Youtube/RAYTPlayer.h; sourceTree = "<group>"; };
+		3C7C793323F668EC003F4342 /* PortfolioListTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PortfolioListTableViewCell.h; path = common/Functions/portfolio/PortfolioListTableViewCell.h; sourceTree = SOURCE_ROOT; };
+		3C7C793423F668EC003F4342 /* PortfolioListTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PortfolioListTableViewCell.m; path = common/Functions/portfolio/PortfolioListTableViewCell.m; sourceTree = SOURCE_ROOT; };
+		3C7C793623F6695B003F4342 /* CommonEditor.iPad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = CommonEditor.iPad.xib; path = ../../common/customUI/CommonEditoriPad/CommonEditor.iPad.xib; sourceTree = "<group>"; };
+		3C7C793823F66960003F4342 /* CommonEditor.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = CommonEditor.storyboard; path = common/CommonEditor/CommonEditor.storyboard; sourceTree = SOURCE_ROOT; };
+		3C7C793A23F66991003F4342 /* iPadCommonEditorCellAction.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = iPadCommonEditorCellAction.xib; path = ../../common/customUI/CommonEditoriPad/iPadCommonEditorCellAction.xib; sourceTree = "<group>"; };
+		3C7C793B23F66992003F4342 /* iPadCommonEditorCellSwitch.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = iPadCommonEditorCellSwitch.xib; path = ../../common/customUI/CommonEditoriPad/iPadCommonEditorCellSwitch.xib; sourceTree = "<group>"; };
+		3C7C793C23F66992003F4342 /* iPadCommonEditorCellImg.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = iPadCommonEditorCellImg.xib; path = ../../common/customUI/CommonEditoriPad/iPadCommonEditorCellImg.xib; sourceTree = "<group>"; };
+		3C7C793D23F66992003F4342 /* iPadCommonEditorCellEnum.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = iPadCommonEditorCellEnum.xib; path = ../../common/customUI/CommonEditoriPad/iPadCommonEditorCellEnum.xib; sourceTree = "<group>"; };
+		3C7C793E23F66992003F4342 /* iPadCommonEditorCellLabel.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = iPadCommonEditorCellLabel.xib; path = ../../common/customUI/CommonEditoriPad/iPadCommonEditorCellLabel.xib; sourceTree = "<group>"; };
+		3C7C793F23F66992003F4342 /* iPadCommonEditorCellMAction.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = iPadCommonEditorCellMAction.xib; path = ../../common/customUI/CommonEditoriPad/iPadCommonEditorCellMAction.xib; sourceTree = "<group>"; };
+		3C7C794023F66992003F4342 /* CommonEditorViewControlleriPad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = CommonEditorViewControlleriPad.xib; path = ../../common/customUI/CommonEditoriPad/CommonEditorViewControlleriPad.xib; sourceTree = "<group>"; };
+		3C7C794123F66992003F4342 /* iPadCommonEditorCellTextView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = iPadCommonEditorCellTextView.xib; path = ../../common/customUI/CommonEditoriPad/iPadCommonEditorCellTextView.xib; sourceTree = "<group>"; };
+		3C7C794223F66992003F4342 /* iPadCommonEditorCellModel.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = iPadCommonEditorCellModel.xib; path = ../../common/customUI/CommonEditoriPad/iPadCommonEditorCellModel.xib; sourceTree = "<group>"; };
+		3C7C794323F66992003F4342 /* iPadCommonEditorCellEdit.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = iPadCommonEditorCellEdit.xib; path = ../../common/customUI/CommonEditoriPad/iPadCommonEditorCellEdit.xib; sourceTree = "<group>"; };
+		3C7C794423F66992003F4342 /* iPadCommonEditorCellSignature.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = iPadCommonEditorCellSignature.xib; path = ../../common/customUI/CommonEditoriPad/iPadCommonEditorCellSignature.xib; sourceTree = "<group>"; };
 		3C7E5A88237BDAE5006D0105 /* PortfolioListViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = PortfolioListViewController.h; path = common/Functions/portfolio/PortfolioListViewController.h; sourceTree = SOURCE_ROOT; };
 		423CC87021D22F87008BD2C4 /* Launch Screen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = SOURCE_ROOT; };
 		42897FFF1E24902E005F1BD8 /* JKTimerManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JKTimerManager.h; sourceTree = "<group>"; };
@@ -368,7 +417,6 @@
 		42BEF38E1E8A4C7D00632AB6 /* GTMNSData+zlib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTMNSData+zlib.h"; sourceTree = "<group>"; };
 		42BEF38F1E8A4C7D00632AB6 /* GTMNSData+zlib.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTMNSData+zlib.m"; sourceTree = "<group>"; };
 		42BEF3901E8A4C7D00632AB6 /* GTMDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMDefines.h; sourceTree = "<group>"; };
-		42BEF3911E8A4C7D00632AB6 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
 		42BEF3921E8A4C7D00632AB6 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 		42BEF3A11E8A4D0000632AB6 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
 		42BEF3A31E8A4D0700632AB6 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
@@ -522,10 +570,6 @@
 		7183E8FA1CF29F4500524787 /* softScanBeep.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = softScanBeep.wav; path = "../ScanApiSDK-10.2.227-2/softScanBeep.wav"; sourceTree = "<group>"; };
 		7183E8FB1CF29F4500524787 /* include */ = {isa = PBXFileReference; lastKnownFileType = folder; name = include; path = "../ScanApiSDK-10.2.227-2/include"; sourceTree = "<group>"; };
 		7183E9271CF29FA600524787 /* config.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
-		7183E9281CF29FCB00524787 /* RAPDFViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RAPDFViewController.h; path = "../common/Functions/PDF+Web/RAPDFViewController.h"; sourceTree = "<group>"; };
-		7183E9291CF29FCB00524787 /* RAPDFViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAPDFViewController.m; path = "../common/Functions/PDF+Web/RAPDFViewController.m"; sourceTree = "<group>"; };
-		7183E92A1CF29FCB00524787 /* WebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebViewController.h; path = "../common/Functions/PDF+Web/WebViewController.h"; sourceTree = "<group>"; };
-		7183E92B1CF29FCB00524787 /* WebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WebViewController.m; path = "../common/Functions/PDF+Web/WebViewController.m"; sourceTree = "<group>"; };
 		7183E92D1CF29FCB00524787 /* AddressEditorViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddressEditorViewController.h; path = ../common/Functions/address/AddressEditorViewController.h; sourceTree = "<group>"; };
 		7183E92E1CF29FCB00524787 /* AddressEditorViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AddressEditorViewController.m; path = ../common/Functions/address/AddressEditorViewController.m; sourceTree = "<group>"; };
 		7183E9301CF29FCB00524787 /* CycleScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CycleScrollView.h; path = ../common/AutoScrollImage/CycleScrollView.h; sourceTree = "<group>"; };
@@ -635,8 +679,6 @@
 		7183E9A11CF29FCB00524787 /* status_filter_cadedate_open.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = status_filter_cadedate_open.json; path = ../common/Functions/order/status_filter_cadedate_open.json; sourceTree = "<group>"; };
 		7183E9A31CF29FCB00524787 /* OrderDetailSignatureCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OrderDetailSignatureCell.h; path = ../common/Functions/order/OrderDetailSignatureCell.h; sourceTree = "<group>"; };
 		7183E9A41CF29FCB00524787 /* OrderDetailSignatureCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OrderDetailSignatureCell.m; path = ../common/Functions/order/OrderDetailSignatureCell.m; sourceTree = "<group>"; };
-		7183E9A61CF29FCB00524787 /* PDFListTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PDFListTableViewCell.h; path = ../common/Functions/portfolio/PDFListTableViewCell.h; sourceTree = "<group>"; };
-		7183E9A71CF29FCB00524787 /* PDFListTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PDFListTableViewCell.m; path = ../common/Functions/portfolio/PDFListTableViewCell.m; sourceTree = "<group>"; };
 		7183E9A91CF29FCB00524787 /* PortfolioListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PortfolioListViewController.m; path = ../common/Functions/portfolio/PortfolioListViewController.m; sourceTree = "<group>"; };
 		7183E9AA1CF29FCB00524787 /* PortfolioViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PortfolioViewController.h; path = ../common/Functions/portfolio/PortfolioViewController.h; sourceTree = "<group>"; };
 		7183E9AB1CF29FCB00524787 /* PortfolioViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PortfolioViewController.m; path = ../common/Functions/portfolio/PortfolioViewController.m; sourceTree = "<group>"; };
@@ -724,12 +766,6 @@
 		71BF07001D2F3CCC00981938 /* OLDataProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OLDataProvider.m; path = common/Functions/offline/OLDataProvider.m; sourceTree = SOURCE_ROOT; };
 		71BF07031D2F3CF300981938 /* OfflineSettingViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OfflineSettingViewController.h; path = common/Functions/offline/OfflineSettingViewController.h; sourceTree = SOURCE_ROOT; };
 		71BF07041D2F3CF300981938 /* OfflineSettingViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OfflineSettingViewController.m; path = common/Functions/offline/OfflineSettingViewController.m; sourceTree = SOURCE_ROOT; };
-		71C1D80B1F45556200CEA1C9 /* Assets.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Assets.bundle; path = common/youtube/Assets.bundle; sourceTree = SOURCE_ROOT; };
-		71C1D80C1F45556200CEA1C9 /* YouTubeiOSPlayerHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = YouTubeiOSPlayerHelper.h; path = common/youtube/YouTubeiOSPlayerHelper.h; sourceTree = SOURCE_ROOT; };
-		71C1D80D1F45556200CEA1C9 /* YTPlayerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = YTPlayerView.h; path = common/youtube/YTPlayerView.h; sourceTree = SOURCE_ROOT; };
-		71C1D80E1F45556200CEA1C9 /* YTPlayerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = YTPlayerView.m; path = common/youtube/YTPlayerView.m; sourceTree = SOURCE_ROOT; };
-		71C1D80F1F45556200CEA1C9 /* YTViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = YTViewController.h; path = common/youtube/YTViewController.h; sourceTree = SOURCE_ROOT; };
-		71C1D8101F45556200CEA1C9 /* YTViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = YTViewController.m; path = common/youtube/YTViewController.m; sourceTree = SOURCE_ROOT; };
 		71C1D8161F45564000CEA1C9 /* ContentPreviewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ContentPreviewController.h; path = Controller/ContentPreviewController.h; sourceTree = "<group>"; };
 		71C1D8171F45564000CEA1C9 /* ContentPreviewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ContentPreviewController.m; path = Controller/ContentPreviewController.m; sourceTree = "<group>"; };
 		71C1D81F1F45574200CEA1C9 /* PhotoList.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = PhotoList.storyboard; path = Storyboard/PhotoList.storyboard; sourceTree = "<group>"; };
@@ -1011,7 +1047,6 @@
 			children = (
 				42BEF38D1E8A4C7D00632AB6 /* Foundation */,
 				42BEF3901E8A4C7D00632AB6 /* GTMDefines.h */,
-				42BEF3911E8A4C7D00632AB6 /* LICENSE */,
 				42BEF3921E8A4C7D00632AB6 /* README.md */,
 			);
 			path = GoogleToolboxForMac;
@@ -1106,6 +1141,13 @@
 				7183EA3B1CF2A04000524787 /* MainViewController.h */,
 				7183EA3C1CF2A04000524787 /* MainViewController.m */,
 				7183E8531CF2913E00524787 /* Assets.xcassets */,
+				3C7C791A23F66821003F4342 /* ERP_Mobile_Cart.storyboard */,
+				3C7C791923F66821003F4342 /* ERP_Mobile_Contact.storyboard */,
+				3C7C791B23F66821003F4342 /* ERP_Mobile_Discard.storyboard */,
+				3C7C791823F66821003F4342 /* ERP_Mobile_Model.storyboard */,
+				3C7C791E23F66821003F4342 /* ERP_Mobile_Order.storyboard */,
+				3C7C791D23F66821003F4342 /* ERP_Mobile_Portfolio.storyboard */,
+				3C7C791C23F66821003F4342 /* ERP_Mobile_Search.storyboard */,
 				7183EA401CF2A04D00524787 /* OLM.storyboard */,
 				7183E8551CF2913E00524787 /* LaunchScreen.storyboard */,
 				7183EA431CF2A06600524787 /* Main.storyboard */,
@@ -1282,6 +1324,19 @@
 		7183E8EF1CF29F4500524787 /* CommonEditor */ = {
 			isa = PBXGroup;
 			children = (
+				3C7C793623F6695B003F4342 /* CommonEditor.iPad.xib */,
+				3C7C793823F66960003F4342 /* CommonEditor.storyboard */,
+				3C7C794023F66992003F4342 /* CommonEditorViewControlleriPad.xib */,
+				3C7C793A23F66991003F4342 /* iPadCommonEditorCellAction.xib */,
+				3C7C794323F66992003F4342 /* iPadCommonEditorCellEdit.xib */,
+				3C7C793D23F66992003F4342 /* iPadCommonEditorCellEnum.xib */,
+				3C7C793C23F66992003F4342 /* iPadCommonEditorCellImg.xib */,
+				3C7C793E23F66992003F4342 /* iPadCommonEditorCellLabel.xib */,
+				3C7C793F23F66992003F4342 /* iPadCommonEditorCellMAction.xib */,
+				3C7C794223F66992003F4342 /* iPadCommonEditorCellModel.xib */,
+				3C7C794423F66992003F4342 /* iPadCommonEditorCellSignature.xib */,
+				3C7C793B23F66992003F4342 /* iPadCommonEditorCellSwitch.xib */,
+				3C7C794123F66992003F4342 /* iPadCommonEditorCellTextView.xib */,
 				428EF77521D37F3C001C9A3B /* CommonEditorAutoCompleteView.h */,
 				428EF77321D37F3C001C9A3B /* CommonEditorAutoCompleteView.m */,
 				428EF77421D37F3C001C9A3B /* CommonEditorAutoCompleteView.xib */,
@@ -1381,10 +1436,11 @@
 		7183E92C1CF29FCB00524787 /* PDF+Web */ = {
 			isa = PBXGroup;
 			children = (
-				7183E9281CF29FCB00524787 /* RAPDFViewController.h */,
-				7183E9291CF29FCB00524787 /* RAPDFViewController.m */,
-				7183E92A1CF29FCB00524787 /* WebViewController.h */,
-				7183E92B1CF29FCB00524787 /* WebViewController.m */,
+				3C7C792823F66853003F4342 /* RAPDFViewController.h */,
+				3C7C792923F66853003F4342 /* RAPDFViewController.m */,
+				3C7C792A23F66853003F4342 /* WebViewController.h */,
+				3C7C792723F66853003F4342 /* WebViewController.m */,
+				3C7C792623F66852003F4342 /* wkweb.storyboard */,
 			);
 			name = "PDF+Web";
 			path = "../iSales-NPD";
@@ -1601,8 +1657,8 @@
 		7183E9B01CF29FCB00524787 /* portfolio */ = {
 			isa = PBXGroup;
 			children = (
-				7183E9A61CF29FCB00524787 /* PDFListTableViewCell.h */,
-				7183E9A71CF29FCB00524787 /* PDFListTableViewCell.m */,
+				3C7C793323F668EC003F4342 /* PortfolioListTableViewCell.h */,
+				3C7C793423F668EC003F4342 /* PortfolioListTableViewCell.m */,
 				3C7E5A88237BDAE5006D0105 /* PortfolioListViewController.h */,
 				7183E9A91CF29FCB00524787 /* PortfolioListViewController.m */,
 				7183E9AA1CF29FCB00524787 /* PortfolioViewController.h */,
@@ -1750,12 +1806,9 @@
 		71C1D80A1F45554B00CEA1C9 /* youtube player */ = {
 			isa = PBXGroup;
 			children = (
-				71C1D80B1F45556200CEA1C9 /* Assets.bundle */,
-				71C1D80C1F45556200CEA1C9 /* YouTubeiOSPlayerHelper.h */,
-				71C1D80D1F45556200CEA1C9 /* YTPlayerView.h */,
-				71C1D80E1F45556200CEA1C9 /* YTPlayerView.m */,
-				71C1D80F1F45556200CEA1C9 /* YTViewController.h */,
-				71C1D8101F45556200CEA1C9 /* YTViewController.m */,
+				3C7C793023F6689D003F4342 /* RAYTPlayer.h */,
+				3C7C792F23F6689D003F4342 /* RAYTPlayer.m */,
+				3C7C792E23F6689D003F4342 /* ytplayer.html */,
 			);
 			name = "youtube player";
 			sourceTree = "<group>";
@@ -1856,28 +1909,48 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				3C7C794823F66992003F4342 /* iPadCommonEditorCellEnum.xib in Resources */,
 				716AF8DE1D792157001188E0 /* offline_status_filter_cadedate.json in Resources */,
 				7183E8571CF2913E00524787 /* LaunchScreen.storyboard in Resources */,
+				3C7C791F23F66821003F4342 /* ERP_Mobile_Model.storyboard in Resources */,
+				3C7C792223F66821003F4342 /* ERP_Mobile_Discard.storyboard in Resources */,
+				3C7C794723F66992003F4342 /* iPadCommonEditorCellImg.xib in Resources */,
 				7183E8541CF2913E00524787 /* Assets.xcassets in Resources */,
 				7183EA1B1CF29FCB00524787 /* status_filter_cadedate_open.json in Resources */,
+				3C7C794923F66992003F4342 /* iPadCommonEditorCellLabel.xib in Resources */,
+				3C7C792023F66821003F4342 /* ERP_Mobile_Contact.storyboard in Resources */,
 				7183EA051CF29FCB00524787 /* customer_info_template_edit.json in Resources */,
+				3C7C792523F66821003F4342 /* ERP_Mobile_Order.storyboard in Resources */,
 				7183E9231CF29F4500524787 /* softScanBeep.wav in Resources */,
 				423CC87121D22F87008BD2C4 /* Launch Screen.storyboard in Resources */,
-				42BEF39E1E8A4C7D00632AB6 /* LICENSE in Resources */,
+				3C7C792B23F66853003F4342 /* wkweb.storyboard in Resources */,
+				3C7C794B23F66992003F4342 /* CommonEditorViewControlleriPad.xib in Resources */,
+				3C7C794A23F66992003F4342 /* iPadCommonEditorCellMAction.xib in Resources */,
+				3C7C793123F6689D003F4342 /* ytplayer.html in Resources */,
 				7183E9F31CF29FCB00524787 /* debug_category_filter.json in Resources */,
 				7183EA441CF2A06600524787 /* Main.storyboard in Resources */,
 				71C1D8201F45574200CEA1C9 /* PhotoList.storyboard in Resources */,
 				7183EA411CF2A04D00524787 /* OLM.storyboard in Resources */,
+				3C7C794C23F66992003F4342 /* iPadCommonEditorCellTextView.xib in Resources */,
+				3C7C794523F66992003F4342 /* iPadCommonEditorCellAction.xib in Resources */,
+				3C7C792323F66821003F4342 /* ERP_Mobile_Search.storyboard in Resources */,
 				42EC5FF91FA1D86300F8FAA4 /* EnumSelectAndSort.storyboard in Resources */,
 				7183EA041CF29FCB00524787 /* customer_info_template.json in Resources */,
+				3C7C794D23F66992003F4342 /* iPadCommonEditorCellModel.xib in Resources */,
+				3C7C794623F66992003F4342 /* iPadCommonEditorCellSwitch.xib in Resources */,
 				7183E9241CF29F4500524787 /* include in Resources */,
+				3C7C792123F66821003F4342 /* ERP_Mobile_Cart.storyboard in Resources */,
 				719562441CF6937F00C74A49 /* default_appearance.json in Resources */,
 				7183E8A21CF29F3900524787 /* LICENSE in Resources */,
 				7183E8FE1CF29F4500524787 /* PhotoBorder@2x.png in Resources */,
 				7183EA031CF29FCB00524787 /* customer_advanced_search.json in Resources */,
-				71C1D8111F45556200CEA1C9 /* Assets.bundle in Resources */,
 				428EF77721D37F3D001C9A3B /* CommonEditorAutoCompleteView.xib in Resources */,
+				3C7C793723F6695B003F4342 /* CommonEditor.iPad.xib in Resources */,
+				3C7C794E23F66992003F4342 /* iPadCommonEditorCellEdit.xib in Resources */,
+				3C7C792423F66821003F4342 /* ERP_Mobile_Portfolio.storyboard in Resources */,
 				7183E8FD1CF29F4500524787 /* PhotoBorder.png in Resources */,
+				3C7C794F23F66992003F4342 /* iPadCommonEditorCellSignature.xib in Resources */,
+				3C7C793923F66961003F4342 /* CommonEditor.storyboard in Resources */,
 				42BB2F081E28986B0025C6CE /* signature.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1960,7 +2033,6 @@
 				7183EA1F1CF29FCB00524787 /* PortfolioListViewController.m in Sources */,
 				7183E8A81CF29F3900524787 /* iSalesDB.m in Sources */,
 				7183E9071CF29F4500524787 /* PulldownMenu.m in Sources */,
-				7183E9E31CF29FCB00524787 /* WebViewController.m in Sources */,
 				7183E9FC1CF29FCB00524787 /* RATreeView+TableViewDelegate.m in Sources */,
 				428980531E249340005F1BD8 /* JKLockButton.m in Sources */,
 				7183E9101CF29F4500524787 /* CommonEditorCellEdit.m in Sources */,
@@ -1976,6 +2048,7 @@
 				7183E8A01CF29F3900524787 /* split.c in Sources */,
 				7183EA2F1CF29FCB00524787 /* LoginViewController.m in Sources */,
 				7183E8981CF29F3900524787 /* ZipArchive.mm in Sources */,
+				3C7C793223F6689D003F4342 /* RAYTPlayer.m in Sources */,
 				4289808A1E24B2C2005F1BD8 /* BasicDrawable.m in Sources */,
 				428980381E2492E0005F1BD8 /* CategoryPriceCell.m in Sources */,
 				7183EA341CF29FCB00524787 /* FunctionTestViewController.m in Sources */,
@@ -2020,6 +2093,7 @@
 				7183EA321CF29FCB00524787 /* ScannerSettingViewController.m in Sources */,
 				42F9FAD71F8C5A8700D9C781 /* NetworkUtils.m in Sources */,
 				428980901E24B2C2005F1BD8 /* PDFDrawable.m in Sources */,
+				3C7C793523F668EC003F4342 /* PortfolioListTableViewCell.m in Sources */,
 				7183E9FD1CF29FCB00524787 /* RATreeView+UIScrollView.m in Sources */,
 				7183EA021CF29FCB00524787 /* ContactListViewController.m in Sources */,
 				7183EA231CF29FCB00524787 /* ScannerControllerView.m in Sources */,
@@ -2047,6 +2121,7 @@
 				7183EA1D1CF29FCB00524787 /* OrderDetailSignatureCell.m in Sources */,
 				7183E9091CF29F4500524787 /* RTLabel.m in Sources */,
 				7183E9F41CF29FCB00524787 /* RATreeNode.m in Sources */,
+				3C7C792C23F66853003F4342 /* WebViewController.m in Sources */,
 				4289803A1E2492E0005F1BD8 /* PriceSettingViewController.m in Sources */,
 				4289800D1E2491A6005F1BD8 /* CartUtils.m in Sources */,
 				7183E89E1CF29F3900524787 /* qrspec.c in Sources */,
@@ -2061,9 +2136,7 @@
 				7183EA191CF29FCB00524787 /* OrderListTableViewCell.m in Sources */,
 				7183E9FA1CF29FCB00524787 /* RATreeView+Private.m in Sources */,
 				7183E8A71CF29F3900524787 /* RAUtils.m in Sources */,
-				71C1D8121F45556200CEA1C9 /* YTPlayerView.m in Sources */,
 				7183EA171CF29FCB00524787 /* OrderDetailPriceCell.m in Sources */,
-				71C1D8131F45556200CEA1C9 /* YTViewController.m in Sources */,
 				7183E89F1CF29F3900524787 /* rscode.c in Sources */,
 				7183E90C1CF29F4500524787 /* TouchLabel.m in Sources */,
 				7183EA0D1CF29FCB00524787 /* LineView.m in Sources */,
@@ -2088,14 +2161,13 @@
 				7183EA381CF29FCB00524787 /* WatchListViewController.m in Sources */,
 				42BEF39B1E8A4C7D00632AB6 /* GoogleAnalyst.m in Sources */,
 				7183EA131CF29FCB00524787 /* CreateOrderViewController.m in Sources */,
-				7183E9E21CF29FCB00524787 /* RAPDFViewController.m in Sources */,
 				7183E9FF1CF29FCB00524787 /* CreditCardEditorViewController.m in Sources */,
 				42A85BFB1E6004180058A9CE /* ERPUtils.m in Sources */,
 				4289801F1E24925A005F1BD8 /* SortButton.m in Sources */,
 				7183E9F81CF29FCB00524787 /* RATreeView.m in Sources */,
 				428980931E24B2C2005F1BD8 /* TableDrawable.m in Sources */,
+				3C7C792D23F66853003F4342 /* RAPDFViewController.m in Sources */,
 				7183EA271CF29FCB00524787 /* FilterCellValue.m in Sources */,
-				7183EA1E1CF29FCB00524787 /* PDFListTableViewCell.m in Sources */,
 				7183EA121CF29FCB00524787 /* HomeViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -2185,7 +2257,7 @@
 					"$(PROJECT_DIR)/common/qrcode",
 					"$(PROJECT_DIR)/common/CommonEditor",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib";
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -2241,7 +2313,7 @@
 					"$(PROJECT_DIR)/common/qrcode",
 					"$(PROJECT_DIR)/common/CommonEditor",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib";
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
@@ -2255,6 +2327,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CURRENT_PROJECT_VERSION = 200214;
 				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2270,7 +2343,7 @@
 					"\"${PODS_ROOT}/Headers/Public/AFNetworking\"",
 				);
 				INFOPLIST_FILE = "HMLG Mobile/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",
@@ -2287,6 +2360,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CURRENT_PROJECT_VERSION = 200214;
 				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2302,7 +2376,7 @@
 					"\"${PODS_ROOT}/Headers/Public/AFNetworking\"",
 				);
 				INFOPLIST_FILE = "HMLG Mobile/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",

+ 1 - 1
RedAnt ERP Mobile/HMLG Mobile/Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>170327</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>

+ 4 - 3
RedAnt ERP Mobile/common/Functions/modelDetail/HomerModelDetailHeaderCell.h

@@ -11,9 +11,9 @@
 #import "PhotoStackView.h"
 #import "RTLabel.h"
 #import "NotificationNameCenter.h"
-#import "YTPlayerView.h"
+//#import "YTPlayerView.h"
 #import "MDHTMLLabel.h"
-
+#import "RAYTPlayer.h"
 
 
 @interface HomerModelDetailHeaderCell : UITableViewCell<PhotoStackViewDataSource, PhotoStackViewDelegate,UIAlertViewDelegate,UITextFieldDelegate>
@@ -52,7 +52,8 @@
 @property (strong, nonatomic) IBOutlet UILabel *cqyt_label;
 @property (strong, nonatomic) IBOutlet UIButton *introduceBtn;
 @property (strong, nonatomic) IBOutlet UIButton *descriptionBtn;
-@property (weak, nonatomic) IBOutlet YTPlayerView *playerView;
+@property (weak, nonatomic) IBOutlet RAYTPlayer *ytplayerView;
+//@property (weak, nonatomic) IBOutlet YTPlayerView *playerView;
 @property (weak, nonatomic) IBOutlet UILabel *hmlg_stock_lb;
 @property (weak, nonatomic) IBOutlet UILabel *hmlg_stock_count_lb;
 @property (weak, nonatomic) IBOutlet UILabel *on_sale_lb;

+ 41 - 20
RedAnt ERP Mobile/common/Functions/modelDetail/HomerModelDetailHeaderCell.m

@@ -78,11 +78,18 @@
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
 {
     
+//    if([keyPath isEqualToString:@"stack_contents"])
+//    {
+//        [self.playerView stopVideo];
+//
+//        self.playerView.hidden=true;
+//
+//    }
     if([keyPath isEqualToString:@"stack_contents"])
     {
-        [self.playerView stopVideo];
+        [self.ytplayerView stopVideo];
         
-        self.playerView.hidden=true;
+        self.ytplayerView.hidden=true;
         
     }
     
@@ -959,28 +966,39 @@ self.informationLabel.frame = CGRectMake(self.informationLabel.frame.origin.x, s
         
         
         //        [TextUtils expression_varable:video regex:<#(NSString *)#>]
+//
+//        NSString* video_id=[self.playerView Embed2VID:video_code];
+//
+//        NSDictionary *playerVars = @{
+//                                     @"playsinline" : @1,
+//                                     @"autoplay" : @(1),
+//                                     @"rel":@0,
+//                                     @"showinfo": @0,
+//                                     @"modestbranding":@0,
+//                                     @"enablejsapi":@1
+//                                     };
+        
+//        [self.playerView loadWithVideoId:video_id playerVars:playerVars];
+//        for(UIView *v in self.playerView.subviews)
+//        {
+//            if([v isKindOfClass:[UIButton class] ])
+//                [self.playerView bringSubviewToFront:v];
+//        }
+//        self.playerView.webView.allowsPictureInPictureMediaPlayback=false;
+//        self.playerView.hidden=false;
+  
         
-        NSString* video_id=[self.playerView Embed2VID:video_code];
-        
-        NSDictionary *playerVars = @{
-                                     @"playsinline" : @1,
-                                     @"autoplay" : @(1),
-                                     @"rel":@0,
-                                     @"showinfo": @0,
-                                     @"modestbranding":@0,
-                                     @"enablejsapi":@1
-                                     };
-        
-        [self.playerView loadWithVideoId:video_id playerVars:playerVars];
-        for(UIView *v in self.playerView.subviews)
+        [self.ytplayerView LoadWithVid:video_code];
+        for(UIView *v in self.ytplayerView.subviews)
         {
             if([v isKindOfClass:[UIButton class] ])
-                [self.playerView bringSubviewToFront:v];
+                [self.ytplayerView bringSubviewToFront:v];
         }
-        self.playerView.webView.allowsPictureInPictureMediaPlayback=false;
-        self.playerView.hidden=false;
+        
+        self.ytplayerView.hidden=false;
         
         return;
+        return;
     } else {
         if ([[self.stack_contents objectForKey:@"count"] integerValue] == 0) {
             return;
@@ -1369,9 +1387,12 @@ self.informationLabel.frame = CGRectMake(self.informationLabel.frame.origin.x, s
 }
 
 - (IBAction)OnClosePlayer:(id)sender {
-    [self.playerView stopVideo];
+//    [self.playerView stopVideo];
+//
+//    self.playerView.hidden=true;
+    [self.ytplayerView stopVideo];
     
-    self.playerView.hidden=true;
+    self.ytplayerView.hidden=true;
 }
 
 - (IBAction)noLoginBtnClick:(UIButton *)sender {

+ 16 - 25
RedAnt ERP Mobile/common/Functions/modelDetail/HomerModelDetailHeaderCell.xib

@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
-    <customFonts key="customFonts">
-        <array key="HelveticaNeue.ttc">
-            <string>HelveticaNeue</string>
-        </array>
-    </customFonts>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
@@ -20,7 +12,7 @@
             <rect key="frame" x="0.0" y="0.0" width="768" height="550"/>
             <autoresizingMask key="autoresizingMask"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="R7c-XN-Jrq" id="6Dz-6I-mEC">
-                <rect key="frame" x="0.0" y="0.0" width="768" height="549.5"/>
+                <rect key="frame" x="0.0" y="0.0" width="768" height="550"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ZLt-fv-kl4">
@@ -242,24 +234,22 @@
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>
-                    <view hidden="YES" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="rOn-ih-C46" customClass="YTPlayerView">
-                        <rect key="frame" x="0.0" y="0.0" width="768" height="553"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
+                    <view hidden="YES" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Xvn-Xy-7jp" customClass="RAYTPlayer">
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="550"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Video player will show here" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Dlx-wR-QB7">
-                                <rect key="frame" x="146" y="233" width="476" height="83"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Video player will show here" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WDb-IQ-c49" userLabel="Video player will be there">
+                                <rect key="frame" x="199.5" y="256" width="369.5" height="38.5"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="32"/>
                                 <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qbj-q2-LbU">
-                                <rect key="frame" x="726" y="15" width="32" height="32"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Nb1-1w-1ti">
+                                <rect key="frame" x="701" y="8" width="67" height="45"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <state key="normal" image="close"/>
-                                <connections>
-                                    <action selector="OnClosePlayer:" destination="R7c-XN-Jrq" eventType="touchUpInside" id="rQM-cU-Tjf"/>
-                                </connections>
                             </button>
                         </subviews>
                         <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
@@ -289,11 +279,12 @@
                 <outlet property="on_sale_lb" destination="mvn-Q4-VfR" id="daB-z8-yQP"/>
                 <outlet property="pageControl" destination="Tgg-P6-WSo" id="ZCJ-AM-l6o"/>
                 <outlet property="photoStack" destination="c4B-EA-s0u" id="aPD-rQ-TnY"/>
-                <outlet property="playerView" destination="rOn-ih-C46" id="OP6-xB-RhP"/>
                 <outlet property="priceLabel" destination="Leg-Uo-pHM" id="TeK-KW-rGA"/>
                 <outlet property="quantity_text" destination="7U2-88-bEi" id="Zol-4a-R29"/>
                 <outlet property="stepper" destination="CCe-eu-ria" id="XZp-Ci-P5V"/>
+                <outlet property="ytplayerView" destination="Xvn-Xy-7jp" id="dhm-Hy-phc"/>
             </connections>
+            <point key="canvasLocation" x="134" y="155"/>
         </tableViewCell>
     </objects>
     <resources>
@@ -302,6 +293,6 @@
         <image name="btn_addtoportfolio" width="124" height="39"/>
         <image name="btn_addtowish" width="124" height="39"/>
         <image name="close" width="32" height="32"/>
-        <image name="notifyMe" width="123" height="39"/>
+        <image name="notifyMe" width="124" height="39"/>
     </resources>
 </document>

+ 188 - 49
RedAnt ERP Mobile/common/Functions/order/OrderDetailViewController.m

@@ -2447,26 +2447,56 @@
     
     if ([type isEqualToString:@"order_info"]) {/** Order Info */
         
+//        NSString *CellIdentifier = @"OrderDetailHtmlCell";
+//        OrderDetailHtmlCell * cell= [tableView dequeueReusableCellWithIdentifier:CellIdentifier forIndexPath:indexPath];
+//
+//
+//
+//
+//
+//        cell.webview.tag = indexPath.section;
+//
+//        cell.webview.delegate = self;
+//        //        cell.webView.scrollView.contentSize.height = 0;
+//        cell.webview.scrollView.bounces=NO;
+//        cell.webview.scrollView.directionalLockEnabled = true;
+//        CGSize size= cell.webview.scrollView.contentSize;
+//        size.height=10;
+//        cell.webview.scrollView.contentSize=size;
+//
+//        [cell.webview loadHTMLString:[section valueForKey:@"data"] baseURL:nil];
+//
+//        cell.backgroundColor = [UIColor whiteColor];
+//        return cell;
+//
+//
+//
+        
         NSString *CellIdentifier = @"OrderDetailHtmlCell";
         OrderDetailHtmlCell * cell= [tableView dequeueReusableCellWithIdentifier:CellIdentifier forIndexPath:indexPath];
         
+        cell.html = nil;
         
         
         
+        cell.wkwebview.tag = indexPath.section;
         
-        cell.webview.tag = indexPath.section;
-        
-        cell.webview.delegate = self;
+        cell.wkwebview.navigationDelegate = self;
         //        cell.webView.scrollView.contentSize.height = 0;
-        cell.webview.scrollView.bounces=NO;
-        cell.webview.scrollView.directionalLockEnabled = true;
-        CGSize size= cell.webview.scrollView.contentSize;
+        cell.wkwebview.scrollView.bounces=NO;
+        cell.wkwebview.scrollView.directionalLockEnabled = true;
+        CGSize size= cell.wkwebview.scrollView.contentSize;
         size.height=10;
-        cell.webview.scrollView.contentSize=size;
+        cell.wkwebview.scrollView.contentSize=size;
+        cell.backgroundColor = [UIColor whiteColor];
         
-        [cell.webview loadHTMLString:[section valueForKey:@"data"] baseURL:nil];
+        cell.wkwebview.userInteractionEnabled = YES;
         
-        cell.backgroundColor = [UIColor whiteColor];
+        cell.html =[section valueForKey:@"data"];
+        NSLog(@"webview loadHTMLString 0");
+        [cell.wkwebview loadHTMLString:[section valueForKey:@"data"] baseURL:nil];
+        NSLog(@"webview loadHTMLString 1");
+
         return cell;
     } else if ([type isEqualToString:@"sign_url"]) { /** Sign */
         
@@ -2567,27 +2597,52 @@
         return cell;
     } else if ([type isEqualToString:@"more_order_info"]) { /** More Info */
         
-        NSString *CellIdentifier = @"OrderDetailHtmlCell";
-        OrderDetailHtmlCell * cell= [tableView dequeueReusableCellWithIdentifier:CellIdentifier forIndexPath:indexPath];
+//        NSString *CellIdentifier = @"OrderDetailHtmlCell";
+//        OrderDetailHtmlCell * cell= [tableView dequeueReusableCellWithIdentifier:CellIdentifier forIndexPath:indexPath];
+//        
+//        
+//        
+//        
+//        cell.webview.tag = indexPath.section;
+//        cell.webview.delegate = self;
+//        //        cell.webView.scrollView.contentSize.height = 0;
+//        cell.webview.scrollView.bounces=NO;
+//        cell.webview.scrollView.directionalLockEnabled = true;
+//        CGSize size= cell.webview.scrollView.contentSize;
+//        size.height=10;
+//        cell.webview.scrollView.contentSize=size;
+//        
+//        
+//        
+//        [cell.webview loadHTMLString:[section valueForKey:@"data"] baseURL:nil];
+//        
+//        cell.backgroundColor = [UIColor whiteColor];
+//        return cell;
         
         
-        
-        
-        cell.webview.tag = indexPath.section;
-        cell.webview.delegate = self;
-        //        cell.webView.scrollView.contentSize.height = 0;
-        cell.webview.scrollView.bounces=NO;
-        cell.webview.scrollView.directionalLockEnabled = true;
-        CGSize size= cell.webview.scrollView.contentSize;
-        size.height=10;
-        cell.webview.scrollView.contentSize=size;
-        
-        
-        
-        [cell.webview loadHTMLString:[section valueForKey:@"data"] baseURL:nil];
-        
-        cell.backgroundColor = [UIColor whiteColor];
-        return cell;
+        NSString *CellIdentifier = @"OrderDetailHtmlCell";
+              OrderDetailHtmlCell * cell= [tableView dequeueReusableCellWithIdentifier:CellIdentifier forIndexPath:indexPath];
+              
+              
+              
+              
+              cell.wkwebview.tag = indexPath.section;
+              cell.wkwebview.navigationDelegate = self;
+              //        cell.webView.scrollView.contentSize.height = 0;
+              cell.wkwebview.scrollView.bounces=NO;
+              cell.wkwebview.scrollView.directionalLockEnabled = true;
+              CGSize size= cell.wkwebview.scrollView.contentSize;
+              size.height=10;
+              cell.wkwebview.scrollView.contentSize=size;
+              
+              
+              
+              NSLog(@"webview loadHTMLString 3");
+              [cell.wkwebview loadHTMLString:[section valueForKey:@"data"] baseURL:nil];
+              NSLog(@"webview loadHTMLString 4");
+              
+              cell.backgroundColor = [UIColor whiteColor];
+              return cell;
         
     } else if ([type isEqualToString:@"sub_order"]) { /** Sub Order */
         
@@ -2838,22 +2893,59 @@
                 
                 
                 
+                cell.html = nil;
                 
+                cell.wkwebview.tag = indexPath.section;
                 
-                cell.webview.tag = indexPath.section;
-                
-                cell.webview.delegate = self;
+                cell.wkwebview.navigationDelegate = self;
                 //        cell.webView.scrollView.contentSize.height = 0;
-                cell.webview.scrollView.bounces=NO;
-                cell.webview.scrollView.directionalLockEnabled = true;
-                CGSize size= cell.webview.scrollView.contentSize;
+                cell.wkwebview.scrollView.bounces=NO;
+                cell.wkwebview.scrollView.directionalLockEnabled = true;
+                CGSize size= cell.wkwebview.scrollView.contentSize;
                 size.height=10;
-                cell.webview.scrollView.contentSize=size;
-                
-                [cell.webview loadHTMLString:[self.content_data valueForKey:@"order_info"] baseURL:nil];
+                cell.wkwebview.scrollView.contentSize=size;
                 
                 cell.backgroundColor = [UIColor whiteColor];
+                
+                cell.wkwebview.userInteractionEnabled = YES;
+                
+                cell.html =[self.content_data valueForKey:@"order_info"];
+                [cell.wkwebview loadHTMLString:[self.content_data valueForKey:@"order_info"] baseURL:nil];
+                
+//                [cell.wkwebview loadHTMLString:[self.content_data valueForKey:@"order_info"] baseURL:nil];
+                
+//                cell.backgroundColor = [UIColor whiteColor];
                 return cell;
+                
+                
+//
+//                NSString *CellIdentifier = @"OrderDetailHtmlCell";
+//                OrderDetailHtmlCell * cell= [tableView dequeueReusableCellWithIdentifier:CellIdentifier forIndexPath:indexPath];
+//
+//                cell.html = nil;
+//
+//
+//
+//                cell.wkwebview.tag = indexPath.section;
+//
+//                cell.wkwebview.navigationDelegate = self;
+//                //        cell.webView.scrollView.contentSize.height = 0;
+//                cell.wkwebview.scrollView.bounces=NO;
+//                cell.wkwebview.scrollView.directionalLockEnabled = true;
+//                CGSize size= cell.wkwebview.scrollView.contentSize;
+//                size.height=10;
+//                cell.wkwebview.scrollView.contentSize=size;
+//                cell.backgroundColor = [UIColor whiteColor];
+//
+//                cell.wkwebview.userInteractionEnabled = YES;
+//
+//                cell.html =[section valueForKey:@"data"];
+//                NSLog(@"webview loadHTMLString 0");
+//                [cell.wkwebview loadHTMLString:[section valueForKey:@"data"] baseURL:nil];
+//                NSLog(@"webview loadHTMLString 1");
+//
+//                return cell;
+                
             }
             else
             {
@@ -2964,22 +3056,69 @@
             
             
             
-            
-            cell.webview.tag = indexPath.section;
-            cell.webview.delegate = self;
-            //        cell.webView.scrollView.contentSize.height = 0;
-            cell.webview.scrollView.bounces=NO;
-            cell.webview.scrollView.directionalLockEnabled = true;
-            CGSize size= cell.webview.scrollView.contentSize;
-            size.height=10;
-            cell.webview.scrollView.contentSize=size;
+            cell.wkwebview.tag = indexPath.section;
+                          cell.wkwebview.navigationDelegate = self;
+                          //        cell.webView.scrollView.contentSize.height = 0;
+                          cell.wkwebview.scrollView.bounces=NO;
+                          cell.wkwebview.scrollView.directionalLockEnabled = true;
+                          CGSize size= cell.wkwebview.scrollView.contentSize;
+                          size.height=10;
+                          cell.wkwebview.scrollView.contentSize=size;
+                          
+                          
+                          
+                          NSLog(@"webview loadHTMLString 3");
+                          [cell.wkwebview loadHTMLString:[self.content_data valueForKey:@"more_order_info"] baseURL:nil];
+                          NSLog(@"webview loadHTMLString 4");
+                          
+                          cell.backgroundColor = [UIColor whiteColor];
+                          return cell;
             
             
+//            cell.webview.tag = indexPath.section;
+//            cell.webview.delegate = self;
+//            //        cell.webView.scrollView.contentSize.height = 0;
+//            cell.webview.scrollView.bounces=NO;
+//            cell.webview.scrollView.directionalLockEnabled = true;
+//            CGSize size= cell.webview.scrollView.contentSize;
+//            size.height=10;
+//            cell.webview.scrollView.contentSize=size;
+//
+//
+//
+//            [cell.webview loadHTMLString:[self.content_data valueForKey:@"more_order_info"] baseURL:nil];
+//
+//            cell.backgroundColor = [UIColor whiteColor];
+            return cell;
             
-            [cell.webview loadHTMLString:[self.content_data valueForKey:@"more_order_info"] baseURL:nil];
+//            { /** More Info */
+//                
+//                NSString *CellIdentifier = @"OrderDetailHtmlCell";
+//                OrderDetailHtmlCell * cell= [tableView dequeueReusableCellWithIdentifier:CellIdentifier forIndexPath:indexPath];
+//                
+//                
+//                
+//                
+//                cell.wkwebview.tag = indexPath.section;
+//                cell.wkwebview.navigationDelegate = self;
+//                //        cell.webView.scrollView.contentSize.height = 0;
+//                cell.wkwebview.scrollView.bounces=NO;
+//                cell.wkwebview.scrollView.directionalLockEnabled = true;
+//                CGSize size= cell.wkwebview.scrollView.contentSize;
+//                size.height=10;
+//                cell.wkwebview.scrollView.contentSize=size;
+//                
+//                
+//                
+//                NSLog(@"webview loadHTMLString 3");
+//                [cell.wkwebview loadHTMLString:[section valueForKey:@"data"] baseURL:nil];
+//                NSLog(@"webview loadHTMLString 4");
+//                
+//                cell.backgroundColor = [UIColor whiteColor];
+//                return cell;
+//                
+//            }
             
-            cell.backgroundColor = [UIColor whiteColor];
-            return cell;
             
             
             //            NSString *CellIdentifier = @"OrderDetailInfoCell";

+ 2 - 0
RedAnt ERP Mobile/common/RAUtils.m

@@ -418,8 +418,10 @@
     }
     return size;
 }
+/*创建错误信息字典*/
 +(NSDictionary*) error_dict:(NSError*)error
 {
+    
     if(error==nil)
         return nil;
     NSMutableDictionary* ret = [[NSMutableDictionary alloc] init];

+ 1 - 0
RedAnt ERP Mobile/common/data_provider/RANetwork.h

@@ -4,6 +4,7 @@
 //
 //  Created by Ray on 14-6-20.
 //  Copyright (c) 2014年 United Software Applications, Inc. All rights reserved.
+//  ERP Mobile 的网络请求处理类
 //
 
 #import <Foundation/Foundation.h>

+ 110 - 38
RedAnt ERP Mobile/iSales-GATIT.xcodeproj/project.pbxproj

@@ -8,6 +8,31 @@
 
 /* Begin PBXBuildFile section */
 		3C2F99B2237BE1540000808F /* PortfolioListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C2F99B1237BE1540000808F /* PortfolioListTableViewCell.m */; };
+		3C7C795B23F67BB1003F4342 /* iPadCommonEditorCellImg.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C795023F67BB0003F4342 /* iPadCommonEditorCellImg.xib */; };
+		3C7C795C23F67BB1003F4342 /* iPadCommonEditorCellMAction.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C795123F67BB0003F4342 /* iPadCommonEditorCellMAction.xib */; };
+		3C7C795D23F67BB1003F4342 /* iPadCommonEditorCellTextView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C795223F67BB1003F4342 /* iPadCommonEditorCellTextView.xib */; };
+		3C7C795E23F67BB1003F4342 /* iPadCommonEditorCellEdit.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C795323F67BB1003F4342 /* iPadCommonEditorCellEdit.xib */; };
+		3C7C795F23F67BB1003F4342 /* iPadCommonEditorCellModel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C795423F67BB1003F4342 /* iPadCommonEditorCellModel.xib */; };
+		3C7C796023F67BB1003F4342 /* iPadCommonEditorCellEnum.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C795523F67BB1003F4342 /* iPadCommonEditorCellEnum.xib */; };
+		3C7C796123F67BB1003F4342 /* CommonEditorViewControlleriPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C795623F67BB1003F4342 /* CommonEditorViewControlleriPad.xib */; };
+		3C7C796223F67BB1003F4342 /* iPadCommonEditorCellSignature.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C795723F67BB1003F4342 /* iPadCommonEditorCellSignature.xib */; };
+		3C7C796323F67BB1003F4342 /* iPadCommonEditorCellAction.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C795823F67BB1003F4342 /* iPadCommonEditorCellAction.xib */; };
+		3C7C796423F67BB1003F4342 /* iPadCommonEditorCellSwitch.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C795923F67BB1003F4342 /* iPadCommonEditorCellSwitch.xib */; };
+		3C7C796523F67BB1003F4342 /* iPadCommonEditorCellLabel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C795A23F67BB1003F4342 /* iPadCommonEditorCellLabel.xib */; };
+		3C7C796A23F67BC0003F4342 /* CommonEditor.iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C796823F67BC0003F4342 /* CommonEditor.iPad.xib */; };
+		3C7C796E23F67BE3003F4342 /* RAYTPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C7C796B23F67BE3003F4342 /* RAYTPlayer.m */; };
+		3C7C796F23F67BE3003F4342 /* ytplayer.html in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C796D23F67BE3003F4342 /* ytplayer.html */; };
+		3C7C797723F67C47003F4342 /* ERP_Mobile_Cart.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C797023F67C47003F4342 /* ERP_Mobile_Cart.storyboard */; };
+		3C7C797823F67C47003F4342 /* ERP_Mobile_Model.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C797123F67C47003F4342 /* ERP_Mobile_Model.storyboard */; };
+		3C7C797923F67C47003F4342 /* ERP_Mobile_Order.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C797223F67C47003F4342 /* ERP_Mobile_Order.storyboard */; };
+		3C7C797A23F67C47003F4342 /* ERP_Mobile_Portfolio.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C797323F67C47003F4342 /* ERP_Mobile_Portfolio.storyboard */; };
+		3C7C797B23F67C47003F4342 /* ERP_Mobile_Search.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C797423F67C47003F4342 /* ERP_Mobile_Search.storyboard */; };
+		3C7C797C23F67C47003F4342 /* ERP_Mobile_Contact.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C797523F67C47003F4342 /* ERP_Mobile_Contact.storyboard */; };
+		3C7C797D23F67C47003F4342 /* ERP_Mobile_Discard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C797623F67C47003F4342 /* ERP_Mobile_Discard.storyboard */; };
+		3C7C797F23F67C69003F4342 /* CommonEditor.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C797E23F67C69003F4342 /* CommonEditor.storyboard */; };
+		3C7C798523F67C89003F4342 /* wkweb.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3C7C798023F67C89003F4342 /* wkweb.storyboard */; };
+		3C7C798623F67C89003F4342 /* RAPDFViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C7C798223F67C89003F4342 /* RAPDFViewController.m */; };
+		3C7C798723F67C89003F4342 /* WebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C7C798423F67C89003F4342 /* WebViewController.m */; };
 		3C7E5A87237BDABE006D0105 /* PortfolioListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C7E5A86237BDABE006D0105 /* PortfolioListViewController.m */; };
 		423CC86F21D22F5E008BD2C4 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 423CC86E21D22F5D008BD2C4 /* Launch Screen.storyboard */; };
 		42843934200EF6D800EE3133 /* homerUI.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 42843933200EF6D700EE3133 /* homerUI.storyboard */; };
@@ -42,7 +67,6 @@
 		42BEF3561E89FE1200632AB6 /* README.md in Sources */ = {isa = PBXBuildFile; fileRef = 42BEF3391E89FE1100632AB6 /* README.md */; };
 		42BEF3571E89FE1200632AB6 /* libGoogleAnalytics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 42BEF33C1E89FE1100632AB6 /* libGoogleAnalytics.a */; };
 		42BEF3581E89FE1200632AB6 /* GTMNSData+zlib.m in Sources */ = {isa = PBXBuildFile; fileRef = 42BEF34B1E89FE1100632AB6 /* GTMNSData+zlib.m */; };
-		42BEF3591E89FE1200632AB6 /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = 42BEF34D1E89FE1100632AB6 /* LICENSE */; };
 		42BEF35A1E89FE1200632AB6 /* README.md in Sources */ = {isa = PBXBuildFile; fileRef = 42BEF34E1E89FE1100632AB6 /* README.md */; };
 		42BEF35D1E89FECD00632AB6 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42BEF35C1E89FECD00632AB6 /* SystemConfiguration.framework */; };
 		42BEF35F1E89FEE300632AB6 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42BEF35E1E89FEE300632AB6 /* CoreData.framework */; };
@@ -122,8 +146,6 @@
 		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 /* 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 */; };
 		7162A50A1C586FC100AB630E /* NSTimer+Addition.m in Sources */ = {isa = PBXBuildFile; fileRef = 7162A5061C586FC100AB630E /* NSTimer+Addition.m */; };
@@ -219,9 +241,6 @@
 		71BF06FB1D2F3CAC00981938 /* OLDataProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 71BF06FA1D2F3CAC00981938 /* OLDataProvider.m */; };
 		71BF06FE1D2F3CBA00981938 /* OfflineSettingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71BF06FD1D2F3CBA00981938 /* OfflineSettingViewController.m */; };
 		71BF07081D2F3D2800981938 /* SyncControlPanelViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71BF07071D2F3D2800981938 /* SyncControlPanelViewController.m */; };
-		71BF33011EFA1D6100842CB4 /* Assets.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 71BF32FB1EFA1D6100842CB4 /* Assets.bundle */; };
-		71BF33021EFA1D6100842CB4 /* YTPlayerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 71BF32FE1EFA1D6100842CB4 /* YTPlayerView.m */; };
-		71BF33031EFA1D6100842CB4 /* YTViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71BF33001EFA1D6100842CB4 /* YTViewController.m */; };
 		71C014CC1F46942400DEB153 /* default_appearance.json in Resources */ = {isa = PBXBuildFile; fileRef = 71C014CB1F46942400DEB153 /* default_appearance.json */; };
 		71C014CE1F46943F00DEB153 /* config.plist in Resources */ = {isa = PBXBuildFile; fileRef = 71C014CD1F46943F00DEB153 /* config.plist */; };
 		71C014D31F46951A00DEB153 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 71C014CF1F46951A00DEB153 /* Main.storyboard */; };
@@ -293,6 +312,34 @@
 /* Begin PBXFileReference section */
 		3C2F99B0237BE1540000808F /* PortfolioListTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PortfolioListTableViewCell.h; path = common/Functions/portfolio/PortfolioListTableViewCell.h; sourceTree = SOURCE_ROOT; };
 		3C2F99B1237BE1540000808F /* PortfolioListTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PortfolioListTableViewCell.m; path = common/Functions/portfolio/PortfolioListTableViewCell.m; sourceTree = SOURCE_ROOT; };
+		3C7C795023F67BB0003F4342 /* iPadCommonEditorCellImg.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = iPadCommonEditorCellImg.xib; path = ../../common/customUI/CommonEditoriPad/iPadCommonEditorCellImg.xib; sourceTree = "<group>"; };
+		3C7C795123F67BB0003F4342 /* iPadCommonEditorCellMAction.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = iPadCommonEditorCellMAction.xib; path = ../../common/customUI/CommonEditoriPad/iPadCommonEditorCellMAction.xib; sourceTree = "<group>"; };
+		3C7C795223F67BB1003F4342 /* iPadCommonEditorCellTextView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = iPadCommonEditorCellTextView.xib; path = ../../common/customUI/CommonEditoriPad/iPadCommonEditorCellTextView.xib; sourceTree = "<group>"; };
+		3C7C795323F67BB1003F4342 /* iPadCommonEditorCellEdit.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = iPadCommonEditorCellEdit.xib; path = ../../common/customUI/CommonEditoriPad/iPadCommonEditorCellEdit.xib; sourceTree = "<group>"; };
+		3C7C795423F67BB1003F4342 /* iPadCommonEditorCellModel.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = iPadCommonEditorCellModel.xib; path = ../../common/customUI/CommonEditoriPad/iPadCommonEditorCellModel.xib; sourceTree = "<group>"; };
+		3C7C795523F67BB1003F4342 /* iPadCommonEditorCellEnum.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = iPadCommonEditorCellEnum.xib; path = ../../common/customUI/CommonEditoriPad/iPadCommonEditorCellEnum.xib; sourceTree = "<group>"; };
+		3C7C795623F67BB1003F4342 /* CommonEditorViewControlleriPad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = CommonEditorViewControlleriPad.xib; path = ../../common/customUI/CommonEditoriPad/CommonEditorViewControlleriPad.xib; sourceTree = "<group>"; };
+		3C7C795723F67BB1003F4342 /* iPadCommonEditorCellSignature.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = iPadCommonEditorCellSignature.xib; path = ../../common/customUI/CommonEditoriPad/iPadCommonEditorCellSignature.xib; sourceTree = "<group>"; };
+		3C7C795823F67BB1003F4342 /* iPadCommonEditorCellAction.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = iPadCommonEditorCellAction.xib; path = ../../common/customUI/CommonEditoriPad/iPadCommonEditorCellAction.xib; sourceTree = "<group>"; };
+		3C7C795923F67BB1003F4342 /* iPadCommonEditorCellSwitch.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = iPadCommonEditorCellSwitch.xib; path = ../../common/customUI/CommonEditoriPad/iPadCommonEditorCellSwitch.xib; sourceTree = "<group>"; };
+		3C7C795A23F67BB1003F4342 /* iPadCommonEditorCellLabel.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = iPadCommonEditorCellLabel.xib; path = ../../common/customUI/CommonEditoriPad/iPadCommonEditorCellLabel.xib; sourceTree = "<group>"; };
+		3C7C796823F67BC0003F4342 /* CommonEditor.iPad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = CommonEditor.iPad.xib; path = ../../common/customUI/CommonEditoriPad/CommonEditor.iPad.xib; sourceTree = "<group>"; };
+		3C7C796B23F67BE3003F4342 /* RAYTPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAYTPlayer.m; path = ../../common/Youtube/RAYTPlayer.m; sourceTree = "<group>"; };
+		3C7C796C23F67BE3003F4342 /* RAYTPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RAYTPlayer.h; path = ../../common/Youtube/RAYTPlayer.h; sourceTree = "<group>"; };
+		3C7C796D23F67BE3003F4342 /* ytplayer.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = ytplayer.html; path = ../../common/Youtube/ytplayer.html; sourceTree = "<group>"; };
+		3C7C797023F67C47003F4342 /* ERP_Mobile_Cart.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = ERP_Mobile_Cart.storyboard; path = common/ERP_Mobile_Cart.storyboard; sourceTree = SOURCE_ROOT; };
+		3C7C797123F67C47003F4342 /* ERP_Mobile_Model.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = ERP_Mobile_Model.storyboard; path = common/ERP_Mobile_Model.storyboard; sourceTree = SOURCE_ROOT; };
+		3C7C797223F67C47003F4342 /* ERP_Mobile_Order.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = ERP_Mobile_Order.storyboard; path = common/ERP_Mobile_Order.storyboard; sourceTree = SOURCE_ROOT; };
+		3C7C797323F67C47003F4342 /* ERP_Mobile_Portfolio.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = ERP_Mobile_Portfolio.storyboard; path = common/ERP_Mobile_Portfolio.storyboard; sourceTree = SOURCE_ROOT; };
+		3C7C797423F67C47003F4342 /* ERP_Mobile_Search.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = ERP_Mobile_Search.storyboard; path = common/ERP_Mobile_Search.storyboard; sourceTree = SOURCE_ROOT; };
+		3C7C797523F67C47003F4342 /* ERP_Mobile_Contact.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = ERP_Mobile_Contact.storyboard; path = common/ERP_Mobile_Contact.storyboard; sourceTree = SOURCE_ROOT; };
+		3C7C797623F67C47003F4342 /* ERP_Mobile_Discard.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = ERP_Mobile_Discard.storyboard; path = common/ERP_Mobile_Discard.storyboard; sourceTree = SOURCE_ROOT; };
+		3C7C797E23F67C69003F4342 /* CommonEditor.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = CommonEditor.storyboard; path = common/CommonEditor/CommonEditor.storyboard; sourceTree = SOURCE_ROOT; };
+		3C7C798023F67C89003F4342 /* wkweb.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = wkweb.storyboard; path = "../../common/WK PDF+Web/wkweb.storyboard"; sourceTree = "<group>"; };
+		3C7C798123F67C89003F4342 /* RAPDFViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RAPDFViewController.h; path = "../../common/WK PDF+Web/RAPDFViewController.h"; sourceTree = "<group>"; };
+		3C7C798223F67C89003F4342 /* RAPDFViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAPDFViewController.m; path = "../../common/WK PDF+Web/RAPDFViewController.m"; sourceTree = "<group>"; };
+		3C7C798323F67C89003F4342 /* WebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebViewController.h; path = "../../common/WK PDF+Web/WebViewController.h"; sourceTree = "<group>"; };
+		3C7C798423F67C89003F4342 /* WebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WebViewController.m; path = "../../common/WK PDF+Web/WebViewController.m"; sourceTree = "<group>"; };
 		3C7E5A85237BDABE006D0105 /* PortfolioListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PortfolioListViewController.h; path = common/Functions/portfolio/PortfolioListViewController.h; sourceTree = SOURCE_ROOT; };
 		3C7E5A86237BDABE006D0105 /* PortfolioListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PortfolioListViewController.m; path = common/Functions/portfolio/PortfolioListViewController.m; sourceTree = SOURCE_ROOT; };
 		423CC86E21D22F5D008BD2C4 /* Launch Screen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = SOURCE_ROOT; };
@@ -365,7 +412,6 @@
 		42BEF34A1E89FE1100632AB6 /* GTMNSData+zlib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTMNSData+zlib.h"; sourceTree = "<group>"; };
 		42BEF34B1E89FE1100632AB6 /* GTMNSData+zlib.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTMNSData+zlib.m"; sourceTree = "<group>"; };
 		42BEF34C1E89FE1100632AB6 /* GTMDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMDefines.h; sourceTree = "<group>"; };
-		42BEF34D1E89FE1100632AB6 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
 		42BEF34E1E89FE1100632AB6 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 		42BEF35C1E89FECD00632AB6 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
 		42BEF35E1E89FEE300632AB6 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
@@ -505,10 +551,6 @@
 		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 /* 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; };
 		7162A5011C586F5B00AB630E /* AddressEditorViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AddressEditorViewController.m; path = common/Functions/address/AddressEditorViewController.m; sourceTree = SOURCE_ROOT; };
 		7162A5031C586FC100AB630E /* CycleScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CycleScrollView.h; path = common/AutoScrollImage/CycleScrollView.h; sourceTree = SOURCE_ROOT; };
@@ -690,12 +732,6 @@
 		71BF06FD1D2F3CBA00981938 /* OfflineSettingViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OfflineSettingViewController.m; path = common/Functions/offline/OfflineSettingViewController.m; sourceTree = SOURCE_ROOT; };
 		71BF07061D2F3D2800981938 /* SyncControlPanelViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SyncControlPanelViewController.h; path = common/Functions/offline/SyncControlPanelViewController.h; sourceTree = SOURCE_ROOT; };
 		71BF07071D2F3D2800981938 /* SyncControlPanelViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SyncControlPanelViewController.m; path = common/Functions/offline/SyncControlPanelViewController.m; sourceTree = SOURCE_ROOT; };
-		71BF32FB1EFA1D6100842CB4 /* Assets.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Assets.bundle; path = common/youtube/Assets.bundle; sourceTree = SOURCE_ROOT; };
-		71BF32FC1EFA1D6100842CB4 /* YouTubeiOSPlayerHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = YouTubeiOSPlayerHelper.h; path = common/youtube/YouTubeiOSPlayerHelper.h; sourceTree = SOURCE_ROOT; };
-		71BF32FD1EFA1D6100842CB4 /* YTPlayerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = YTPlayerView.h; path = common/youtube/YTPlayerView.h; sourceTree = SOURCE_ROOT; };
-		71BF32FE1EFA1D6100842CB4 /* YTPlayerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = YTPlayerView.m; path = common/youtube/YTPlayerView.m; sourceTree = SOURCE_ROOT; };
-		71BF32FF1EFA1D6100842CB4 /* YTViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = YTViewController.h; path = common/youtube/YTViewController.h; sourceTree = SOURCE_ROOT; };
-		71BF33001EFA1D6100842CB4 /* YTViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = YTViewController.m; path = common/youtube/YTViewController.m; sourceTree = SOURCE_ROOT; };
 		71C014CB1F46942400DEB153 /* default_appearance.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = default_appearance.json; sourceTree = "<group>"; };
 		71C014CD1F46943F00DEB153 /* config.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = config.plist; path = "iSales-NPD/config.plist"; sourceTree = SOURCE_ROOT; };
 		71C014D01F46951A00DEB153 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = "iSales-NPD/Base.lproj/Main.storyboard"; sourceTree = SOURCE_ROOT; };
@@ -1056,7 +1092,6 @@
 			children = (
 				42BEF3491E89FE1100632AB6 /* Foundation */,
 				42BEF34C1E89FE1100632AB6 /* GTMDefines.h */,
-				42BEF34D1E89FE1100632AB6 /* LICENSE */,
 				42BEF34E1E89FE1100632AB6 /* README.md */,
 			);
 			path = GoogleToolboxForMac;
@@ -1319,6 +1354,13 @@
 				428980031E2490C1005F1BD8 /* NotificationNameCenter.m */,
 				7162A5E71C5899F700AB630E /* MainViewController.h */,
 				7162A5E81C5899F700AB630E /* MainViewController.m */,
+				3C7C797023F67C47003F4342 /* ERP_Mobile_Cart.storyboard */,
+				3C7C797523F67C47003F4342 /* ERP_Mobile_Contact.storyboard */,
+				3C7C797623F67C47003F4342 /* ERP_Mobile_Discard.storyboard */,
+				3C7C797123F67C47003F4342 /* ERP_Mobile_Model.storyboard */,
+				3C7C797223F67C47003F4342 /* ERP_Mobile_Order.storyboard */,
+				3C7C797323F67C47003F4342 /* ERP_Mobile_Portfolio.storyboard */,
+				3C7C797423F67C47003F4342 /* ERP_Mobile_Search.storyboard */,
 				71C1D8301F456A9100CEA1C9 /* CUL.storyboard */,
 				71C014CF1F46951A00DEB153 /* Main.storyboard */,
 				71C014D11F46951A00DEB153 /* OLM.storyboard */,
@@ -1688,10 +1730,11 @@
 		7190F1091BBBCAF100B2F243 /* PDF+Web */ = {
 			isa = PBXGroup;
 			children = (
-				7162A4FA1C585FFB00AB630E /* RAPDFViewController.h */,
-				7162A4FB1C585FFB00AB630E /* RAPDFViewController.m */,
-				7162A4FC1C585FFB00AB630E /* WebViewController.h */,
-				7162A4FD1C585FFB00AB630E /* WebViewController.m */,
+				3C7C798123F67C89003F4342 /* RAPDFViewController.h */,
+				3C7C798223F67C89003F4342 /* RAPDFViewController.m */,
+				3C7C798323F67C89003F4342 /* WebViewController.h */,
+				3C7C798423F67C89003F4342 /* WebViewController.m */,
+				3C7C798023F67C89003F4342 /* wkweb.storyboard */,
 			);
 			name = "PDF+Web";
 			sourceTree = "<group>";
@@ -1826,12 +1869,9 @@
 		71BF32FA1EFA1C0700842CB4 /* youtube player */ = {
 			isa = PBXGroup;
 			children = (
-				71BF32FB1EFA1D6100842CB4 /* Assets.bundle */,
-				71BF32FC1EFA1D6100842CB4 /* YouTubeiOSPlayerHelper.h */,
-				71BF32FD1EFA1D6100842CB4 /* YTPlayerView.h */,
-				71BF32FE1EFA1D6100842CB4 /* YTPlayerView.m */,
-				71BF32FF1EFA1D6100842CB4 /* YTViewController.h */,
-				71BF33001EFA1D6100842CB4 /* YTViewController.m */,
+				3C7C796C23F67BE3003F4342 /* RAYTPlayer.h */,
+				3C7C796B23F67BE3003F4342 /* RAYTPlayer.m */,
+				3C7C796D23F67BE3003F4342 /* ytplayer.html */,
 			);
 			name = "youtube player";
 			sourceTree = "<group>";
@@ -1886,6 +1926,19 @@
 		71DF743A1C575E6600F2789C /* CommonEditor */ = {
 			isa = PBXGroup;
 			children = (
+				3C7C797E23F67C69003F4342 /* CommonEditor.storyboard */,
+				3C7C796823F67BC0003F4342 /* CommonEditor.iPad.xib */,
+				3C7C795623F67BB1003F4342 /* CommonEditorViewControlleriPad.xib */,
+				3C7C795823F67BB1003F4342 /* iPadCommonEditorCellAction.xib */,
+				3C7C795323F67BB1003F4342 /* iPadCommonEditorCellEdit.xib */,
+				3C7C795523F67BB1003F4342 /* iPadCommonEditorCellEnum.xib */,
+				3C7C795023F67BB0003F4342 /* iPadCommonEditorCellImg.xib */,
+				3C7C795A23F67BB1003F4342 /* iPadCommonEditorCellLabel.xib */,
+				3C7C795123F67BB0003F4342 /* iPadCommonEditorCellMAction.xib */,
+				3C7C795423F67BB1003F4342 /* iPadCommonEditorCellModel.xib */,
+				3C7C795723F67BB1003F4342 /* iPadCommonEditorCellSignature.xib */,
+				3C7C795923F67BB1003F4342 /* iPadCommonEditorCellSwitch.xib */,
+				3C7C795223F67BB1003F4342 /* iPadCommonEditorCellTextView.xib */,
 				42CB4AFF20085228006BDB88 /* AutoComplete */,
 				42D8CD581FC6620C005BEA15 /* CommonEditorTableContainerView.h */,
 				42D8CD571FC6620C005BEA15 /* CommonEditorTableContainerView.m */,
@@ -2002,46 +2055,66 @@
 				71C014CE1F46943F00DEB153 /* config.plist in Resources */,
 				428EF76B21D36978001C9A3B /* MasterModel.storyboard in Resources */,
 				71C1D83E1F456BE800CEA1C9 /* order_info.html in Resources */,
-				42BEF3591E89FE1200632AB6 /* LICENSE in Resources */,
 				71C1D8411F456BE800CEA1C9 /* createContact.json in Resources */,
+				3C7C797A23F67C47003F4342 /* ERP_Mobile_Portfolio.storyboard in Resources */,
+				3C7C795F23F67BB1003F4342 /* iPadCommonEditorCellModel.xib in Resources */,
 				7115D45D1E16317600EF4E4C /* CommonEditor.storyboard in Resources */,
 				713F76C21929F4A7006A7305 /* Images.xcassets in Resources */,
-				71BF33011EFA1D6100842CB4 /* Assets.bundle in Resources */,
+				3C7C797823F67C47003F4342 /* ERP_Mobile_Model.storyboard in Resources */,
 				71C1D8431F456BE800CEA1C9 /* orderDetail.json in Resources */,
 				71C1D8311F456A9100CEA1C9 /* CUL.storyboard in Resources */,
 				713F76B41929F4A7006A7305 /* InfoPlist.strings in Resources */,
 				71C1D85C1F456E2500CEA1C9 /* debug_category_filter.json in Resources */,
 				42EC600B1FA1D90C00F8FAA4 /* EnumSelectAndSort.storyboard in Resources */,
 				42ED88A61FC3AF69000687C8 /* HomerModelDetailHeaderCell.xib in Resources */,
+				3C7C797D23F67C47003F4342 /* ERP_Mobile_Discard.storyboard in Resources */,
 				71C014D31F46951A00DEB153 /* Main.storyboard in Resources */,
 				7165662F1EF3ACD900CB897F /* photostack_video.html in Resources */,
+				3C7C796323F67BB1003F4342 /* iPadCommonEditorCellAction.xib in Resources */,
+				3C7C797923F67C47003F4342 /* ERP_Mobile_Order.storyboard in Resources */,
 				71C1D8421F456BE800CEA1C9 /* editContact.json in Resources */,
+				3C7C795E23F67BB1003F4342 /* iPadCommonEditorCellEdit.xib in Resources */,
+				3C7C796F23F67BE3003F4342 /* ytplayer.html in Resources */,
 				7162A5A01C58733400AB630E /* status_filter_cadedate_open.json in Resources */,
 				71C014D41F46951A00DEB153 /* OLM.storyboard in Resources */,
 				7161FEB71D61B24900157EE1 /* orderinfo.html in Resources */,
 				71C1D8491F456C2200CEA1C9 /* portfolio_3x2.json in Resources */,
 				7161FEB51D61B24900157EE1 /* creditcardpayment.html in Resources */,
+				3C7C796023F67BB1003F4342 /* iPadCommonEditorCellEnum.xib in Resources */,
+				3C7C797C23F67C47003F4342 /* ERP_Mobile_Contact.storyboard in Resources */,
 				71C1D8401F456BE800CEA1C9 /* contactAdvanceSearch.json in Resources */,
+				3C7C796123F67BB1003F4342 /* CommonEditorViewControlleriPad.xib in Resources */,
 				71DF74951C57614C00F2789C /* PhotoBorder.png in Resources */,
 				7162A55F1C58724700AB630E /* customer_info_template.json in Resources */,
+				3C7C795C23F67BB1003F4342 /* iPadCommonEditorCellMAction.xib in Resources */,
+				3C7C797F23F67C69003F4342 /* CommonEditor.storyboard in Resources */,
 				42D3A4A21EFA6D36007A54C1 /* PhotoList.storyboard in Resources */,
 				7141DD3D1C5726B700F7DF59 /* softScanBeep.wav in Resources */,
 				42843934200EF6D800EE3133 /* homerUI.storyboard in Resources */,
+				3C7C796A23F67BC0003F4342 /* CommonEditor.iPad.xib in Resources */,
 				71C1D84B1F456C2200CEA1C9 /* so.json in Resources */,
+				3C7C796223F67BB1003F4342 /* iPadCommonEditorCellSignature.xib in Resources */,
 				71C1D83D1F456BE800CEA1C9 /* more_info.html in Resources */,
+				3C7C797B23F67C47003F4342 /* ERP_Mobile_Search.storyboard in Resources */,
 				7141DD341C57269B00F7DF59 /* include in Resources */,
+				3C7C795B23F67BB1003F4342 /* iPadCommonEditorCellImg.xib in Resources */,
 				7141DD601C5747CE00F7DF59 /* LICENSE in Resources */,
+				3C7C798523F67C89003F4342 /* wkweb.storyboard in Resources */,
 				71D01ADD1E08CB1C006620CE /* signature.storyboard in Resources */,
+				3C7C796523F67BB1003F4342 /* iPadCommonEditorCellLabel.xib in Resources */,
 				7111E5721C76C557004763B3 /* customer_info_template_edit.json in Resources */,
 				7161FEB61D61B24900157EE1 /* normalpayment.html in Resources */,
 				71DF74961C57614C00F2789C /* PhotoBorder@2x.png in Resources */,
 				71C1D83F1F456BE800CEA1C9 /* category.json in Resources */,
 				7165662E1EF3ACD900CB897F /* photostack_image.html in Resources */,
 				712AFEE51DBDAF0300254965 /* pdfcreator.xcassets in Resources */,
+				3C7C796423F67BB1003F4342 /* iPadCommonEditorCellSwitch.xib in Resources */,
 				7162A55E1C58724700AB630E /* customer_advanced_search.json in Resources */,
 				7162A5A11C58733400AB630E /* offline_status_filter_cadedate.json in Resources */,
+				3C7C797723F67C47003F4342 /* ERP_Mobile_Cart.storyboard in Resources */,
 				71C014CC1F46942400DEB153 /* default_appearance.json in Resources */,
 				42B309791E45BA32007AFC62 /* status_filter_cadedate_po.json in Resources */,
+				3C7C795D23F67BB1003F4342 /* iPadCommonEditorCellTextView.xib in Resources */,
 				71C1D8481F456C2200CEA1C9 /* portfolio_2x3.json in Resources */,
 				423CC86F21D22F5E008BD2C4 /* Launch Screen.storyboard in Resources */,
 				71C1D84A1F456C2200CEA1C9 /* so_thumb.json in Resources */,
@@ -2158,6 +2231,7 @@
 				71D01B1B1E0A2055006620CE /* PDFUtils.m in Sources */,
 				7141DD4F1C57459B00F7DF59 /* mask.c in Sources */,
 				428EF76A21D36978001C9A3B /* MasterModelViewController.m in Sources */,
+				3C7C798623F67C89003F4342 /* RAPDFViewController.m in Sources */,
 				7162A54E1C58722200AB630E /* CreditCardEditorViewController.m in Sources */,
 				7162A5C31C5873BB00AB630E /* ItemSearchFilterViewController.m in Sources */,
 				71D30A2D1CFC0EF8006F9477 /* DefaultImageButton.m in Sources */,
@@ -2221,18 +2295,17 @@
 				7162A5471C58719D00AB630E /* RATreeView+Private.m in Sources */,
 				428980041E2490C1005F1BD8 /* NotificationNameCenter.m in Sources */,
 				42D8CD591FC6620C005BEA15 /* CommonEditorTableContainerView.m in Sources */,
+				3C7C796E23F67BE3003F4342 /* RAYTPlayer.m in Sources */,
 				4289802C1E2492D2005F1BD8 /* CategoryPriceViewController.m in Sources */,
 				42BEF3511E89FE1200632AB6 /* CHANGELOG.md in Sources */,
 				42BEF35A1E89FE1200632AB6 /* README.md in Sources */,
 				71DF748D1C57608F00F2789C /* TouchLabel.m in Sources */,
-				71BF33031EFA1D6100842CB4 /* YTViewController.m in Sources */,
 				428980171E24924D005F1BD8 /* SortItemViewController.m in Sources */,
 				42D3A4A11EFA6D36007A54C1 /* ContentPreviewController.m in Sources */,
 				7162A5711C58728D00AB630E /* DetailImageCell.m in Sources */,
 				7162A51A1C58704600AB630E /* ModelItemCell.m in Sources */,
 				7141DD511C57459B00F7DF59 /* qrencode.c in Sources */,
 				7162A5451C58719D00AB630E /* RATreeView.m in Sources */,
-				7162A4FE1C585FFB00AB630E /* RAPDFViewController.m in Sources */,
 				71DF74841C57608F00F2789C /* ImageScrollerViewController.m in Sources */,
 				71DF74861C57608F00F2789C /* ImageViewController.m in Sources */,
 				7162A5821C5872EF00AB630E /* HomeTableViewCellButtonBanner.m in Sources */,
@@ -2241,7 +2314,6 @@
 				71DF74611C575E7900F2789C /* CommonEditorCellModel.m in Sources */,
 				71DF74341C5757DA00F2789C /* ActiveViewController.m in Sources */,
 				7162A5431C58719D00AB630E /* RATreeNodeInfo.m in Sources */,
-				7162A4FF1C585FFB00AB630E /* WebViewController.m in Sources */,
 				71FFBBE91C60894900D91DC2 /* iSalesDB.m in Sources */,
 				7162A55B1C58724700AB630E /* ContactAdvanceSearchViewController.m in Sources */,
 				428EF76C21D36978001C9A3B /* MasterModelCell.m in Sources */,
@@ -2265,8 +2337,8 @@
 				7141DD3C1C5726B700F7DF59 /* ScanApiHelper.mm in Sources */,
 				7162A5261C58706C00AB630E /* CategoryViewController.m in Sources */,
 				7162A50A1C586FC100AB630E /* NSTimer+Addition.m in Sources */,
-				71BF33021EFA1D6100842CB4 /* YTPlayerView.m in Sources */,
 				71DF745E1C575E7900F2789C /* CommonEditorCellImg.m in Sources */,
+				3C7C798723F67C89003F4342 /* WebViewController.m in Sources */,
 				712AFED91DBA050200254965 /* GroupDrawable.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -2353,7 +2425,7 @@
 					"$(PROJECT_DIR)/common/qrcode",
 					"$(PROJECT_DIR)/common/CommonEditor",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib";
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = "Titan Importer";
@@ -2407,7 +2479,7 @@
 					"$(PROJECT_DIR)/common/qrcode",
 					"$(PROJECT_DIR)/common/CommonEditor",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib";
 				PRODUCT_NAME = "Titan Importer";
 				SDKROOT = iphoneos;
@@ -2433,7 +2505,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "iSales-GATIT/iSales-GATIT-Prefix.pch";
 				INFOPLIST_FILE = "iSales-GATIT/iSales-GATIT-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",
 					"$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries",
@@ -2475,7 +2547,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "iSales-GATIT/iSales-GATIT-Prefix.pch";
 				INFOPLIST_FILE = "iSales-GATIT/iSales-GATIT-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",
 					"$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries",

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

@@ -2490,7 +2490,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 200119;
+				CURRENT_PROJECT_VERSION = 200211;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2507,7 +2507,7 @@
 					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",
 					"$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries",
 				);
-				MARKETING_VERSION = 1.96;
+				MARKETING_VERSION = 1.97;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -2534,7 +2534,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 200119;
+				CURRENT_PROJECT_VERSION = 200211;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2551,7 +2551,7 @@
 					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",
 					"$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries",
 				);
-				MARKETING_VERSION = 1.96;
+				MARKETING_VERSION = 1.97;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

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

@@ -12,7 +12,7 @@
 #define BACKORDER_PROCESS // 允许backorder process
 
 # ifdef DEBUG
-#define test_server
+//#define test_server
 # endif
 
 #define exception_switch 1

+ 2 - 2
RedAnt ERP Mobile/iSales-USAI.xcodeproj/project.pbxproj

@@ -2488,7 +2488,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 200116;
+				CURRENT_PROJECT_VERSION = 200119;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2531,7 +2531,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 200116;
+				CURRENT_PROJECT_VERSION = 200119;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",