Procházet zdrojové kódy

160726 add offline mode

Ray Zhang před 9 roky
rodič
revize
4f4f760b91

+ 27 - 12
RedAnt ERP Mobile/HMLG Mobile.xcodeproj/project.pbxproj

@@ -31,7 +31,6 @@
 		7183E8A71CF29F3900524787 /* RAUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 7183E88C1CF29F3900524787 /* RAUtils.m */; };
 		7183E8A81CF29F3900524787 /* iSalesDB.m in Sources */ = {isa = PBXBuildFile; fileRef = 7183E88E1CF29F3900524787 /* iSalesDB.m */; };
 		7183E8A91CF29F3900524787 /* iSalesNetwork.m in Sources */ = {isa = PBXBuildFile; fileRef = 7183E8901CF29F3900524787 /* iSalesNetwork.m */; };
-		7183E8AA1CF29F3900524787 /* OLDataProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 7183E8921CF29F3900524787 /* OLDataProvider.m */; };
 		7183E8FD1CF29F4500524787 /* PhotoBorder.png in Resources */ = {isa = PBXBuildFile; fileRef = 7183E8AB1CF29F4500524787 /* PhotoBorder.png */; };
 		7183E8FE1CF29F4500524787 /* PhotoBorder@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7183E8AC1CF29F4500524787 /* PhotoBorder@2x.png */; };
 		7183E8FF1CF29F4500524787 /* PhotoStackView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7183E8AE1CF29F4500524787 /* PhotoStackView.m */; };
@@ -157,7 +156,6 @@
 		7183EA341CF29FCB00524787 /* FunctionTestViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7183E9D71CF29FCB00524787 /* FunctionTestViewController.m */; };
 		7183EA351CF29FCB00524787 /* SimplifiedBuyingProgramViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7183E9D91CF29FCB00524787 /* SimplifiedBuyingProgramViewController.m */; };
 		7183EA361CF29FCB00524787 /* UserListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7183E9DB1CF29FCB00524787 /* UserListViewController.m */; };
-		7183EA371CF29FCB00524787 /* OfflineSettingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7183E9DD1CF29FCB00524787 /* OfflineSettingViewController.m */; };
 		7183EA381CF29FCB00524787 /* WatchListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7183E9E01CF29FCB00524787 /* WatchListViewController.m */; };
 		7183EA3D1CF2A04000524787 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7183EA3A1CF2A04000524787 /* AppDelegate.m */; };
 		7183EA3E1CF2A04000524787 /* MainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7183EA3C1CF2A04000524787 /* MainViewController.m */; };
@@ -184,6 +182,9 @@
 		719562391CF57BFC00C74A49 /* CategoryHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 719562381CF57BFC00C74A49 /* CategoryHeaderView.m */; };
 		7195623F1CF580E800C74A49 /* DefaultTableHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7195623E1CF580E800C74A49 /* DefaultTableHeaderView.m */; };
 		719562441CF6937F00C74A49 /* default_appearance.json in Resources */ = {isa = PBXBuildFile; fileRef = 719562431CF6937F00C74A49 /* default_appearance.json */; };
+		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 */; };
 		71D30A2A1CFC0EDD006F9477 /* DefaultImageButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 71D30A291CFC0EDD006F9477 /* DefaultImageButton.m */; };
 /* End PBXBuildFile section */
 
@@ -236,8 +237,6 @@
 		7183E88E1CF29F3900524787 /* iSalesDB.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = iSalesDB.m; path = ../common/data_provider/iSalesDB.m; sourceTree = "<group>"; };
 		7183E88F1CF29F3900524787 /* iSalesNetwork.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iSalesNetwork.h; path = ../common/data_provider/iSalesNetwork.h; sourceTree = "<group>"; };
 		7183E8901CF29F3900524787 /* iSalesNetwork.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = iSalesNetwork.m; path = ../common/data_provider/iSalesNetwork.m; sourceTree = "<group>"; };
-		7183E8911CF29F3900524787 /* OLDataProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OLDataProvider.h; sourceTree = "<group>"; };
-		7183E8921CF29F3900524787 /* OLDataProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OLDataProvider.m; sourceTree = "<group>"; };
 		7183E8AB1CF29F4500524787 /* PhotoBorder.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = PhotoBorder.png; path = ../common/photoStack/PhotoBorder.png; sourceTree = "<group>"; };
 		7183E8AC1CF29F4500524787 /* PhotoBorder@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "PhotoBorder@2x.png"; path = "../common/photoStack/PhotoBorder@2x.png"; sourceTree = "<group>"; };
 		7183E8AD1CF29F4500524787 /* PhotoStackView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PhotoStackView.h; path = ../common/photoStack/PhotoStackView.h; sourceTree = "<group>"; };
@@ -480,8 +479,6 @@
 		7183E9D91CF29FCB00524787 /* SimplifiedBuyingProgramViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SimplifiedBuyingProgramViewController.m; path = ../common/Functions/sidemenu/SimplifiedBuyingProgramViewController.m; sourceTree = "<group>"; };
 		7183E9DA1CF29FCB00524787 /* UserListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UserListViewController.h; path = ../common/Functions/sidemenu/UserListViewController.h; sourceTree = "<group>"; };
 		7183E9DB1CF29FCB00524787 /* UserListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = UserListViewController.m; path = ../common/Functions/sidemenu/UserListViewController.m; sourceTree = "<group>"; };
-		7183E9DC1CF29FCB00524787 /* OfflineSettingViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OfflineSettingViewController.h; sourceTree = "<group>"; };
-		7183E9DD1CF29FCB00524787 /* OfflineSettingViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OfflineSettingViewController.m; sourceTree = "<group>"; };
 		7183E9DF1CF29FCB00524787 /* WatchListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WatchListViewController.h; path = ../common/Functions/watchlist/WatchListViewController.h; sourceTree = "<group>"; };
 		7183E9E01CF29FCB00524787 /* WatchListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WatchListViewController.m; path = ../common/Functions/watchlist/WatchListViewController.m; sourceTree = "<group>"; };
 		7183EA391CF2A04000524787 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = "../iSales-NPD/AppDelegate.h"; sourceTree = "<group>"; };
@@ -518,6 +515,12 @@
 		7195623D1CF580E800C74A49 /* DefaultTableHeaderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DefaultTableHeaderView.h; path = common/customUI/DefaultTableHeaderView.h; sourceTree = SOURCE_ROOT; };
 		7195623E1CF580E800C74A49 /* DefaultTableHeaderView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DefaultTableHeaderView.m; path = common/customUI/DefaultTableHeaderView.m; sourceTree = SOURCE_ROOT; };
 		719562431CF6937F00C74A49 /* default_appearance.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = default_appearance.json; sourceTree = "<group>"; };
+		71AD1E081D3E039E008B7685 /* SyncControlPanelViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SyncControlPanelViewController.h; path = common/Functions/offline/SyncControlPanelViewController.h; sourceTree = SOURCE_ROOT; };
+		71AD1E091D3E039E008B7685 /* SyncControlPanelViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SyncControlPanelViewController.m; path = common/Functions/offline/SyncControlPanelViewController.m; sourceTree = SOURCE_ROOT; };
+		71BF06FF1D2F3CCC00981938 /* OLDataProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OLDataProvider.h; path = common/Functions/offline/OLDataProvider.h; sourceTree = SOURCE_ROOT; };
+		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; };
 		71D30A281CFC0EDD006F9477 /* DefaultImageButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DefaultImageButton.h; path = common/Functions/DefaultImageButton.h; sourceTree = SOURCE_ROOT; };
 		71D30A291CFC0EDD006F9477 /* DefaultImageButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DefaultImageButton.m; path = common/Functions/DefaultImageButton.m; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
@@ -581,6 +584,7 @@
 				7183E9781CF29FCB00524787 /* contact */,
 				7183E9851CF29FCB00524787 /* DetailView */,
 				7183E9901CF29FCB00524787 /* HomeView */,
+				71BF07021D2F3CE000981938 /* offline */,
 				7183E9A51CF29FCB00524787 /* order */,
 				7183E9B01CF29FCB00524787 /* portfolio */,
 				7183E9B71CF29FCB00524787 /* cam_scan */,
@@ -685,8 +689,8 @@
 				7183E88E1CF29F3900524787 /* iSalesDB.m */,
 				7183E88F1CF29F3900524787 /* iSalesNetwork.h */,
 				7183E8901CF29F3900524787 /* iSalesNetwork.m */,
-				7183E8911CF29F3900524787 /* OLDataProvider.h */,
-				7183E8921CF29F3900524787 /* OLDataProvider.m */,
+				71BF06FF1D2F3CCC00981938 /* OLDataProvider.h */,
+				71BF07001D2F3CCC00981938 /* OLDataProvider.m */,
 			);
 			name = utils;
 			path = "../iSales-NPD";
@@ -1129,8 +1133,6 @@
 				7183E9D91CF29FCB00524787 /* SimplifiedBuyingProgramViewController.m */,
 				7183E9DA1CF29FCB00524787 /* UserListViewController.h */,
 				7183E9DB1CF29FCB00524787 /* UserListViewController.m */,
-				7183E9DC1CF29FCB00524787 /* OfflineSettingViewController.h */,
-				7183E9DD1CF29FCB00524787 /* OfflineSettingViewController.m */,
 			);
 			name = sideMenu;
 			path = "../iSales-NPD";
@@ -1186,6 +1188,18 @@
 			name = appearance;
 			sourceTree = "<group>";
 		};
+		71BF07021D2F3CE000981938 /* offline */ = {
+			isa = PBXGroup;
+			children = (
+				71BF07031D2F3CF300981938 /* OfflineSettingViewController.h */,
+				71BF07041D2F3CF300981938 /* OfflineSettingViewController.m */,
+				71AD1E081D3E039E008B7685 /* SyncControlPanelViewController.h */,
+				71AD1E091D3E039E008B7685 /* SyncControlPanelViewController.m */,
+			);
+			name = offline;
+			path = "../iSales-NPD";
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -1273,6 +1287,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				7183E89C1CF29F3900524787 /* qrencode.c in Sources */,
+				71AD1E0A1D3E039E008B7685 /* SyncControlPanelViewController.m in Sources */,
 				7183E90A1CF29F4500524787 /* SimpleGrid.m in Sources */,
 				7183E9EF1CF29FCB00524787 /* CategoryCellNPD.m in Sources */,
 				7183E8961CF29F3900524787 /* unzip.c in Sources */,
@@ -1308,7 +1323,6 @@
 				7183E9F61CF29FCB00524787 /* RATreeNodeInfo.m in Sources */,
 				7183E9ED1CF29FCB00524787 /* ItemNotesViewController.m in Sources */,
 				7183EA251CF29FCB00524787 /* SCShapeView.m in Sources */,
-				7183E8AA1CF29F3900524787 /* OLDataProvider.m in Sources */,
 				7183EA201CF29FCB00524787 /* PortfolioViewController.m in Sources */,
 				7183E8FF1CF29F4500524787 /* PhotoStackView.m in Sources */,
 				7183E9031CF29F4500524787 /* ImageScrollerViewController.m in Sources */,
@@ -1325,7 +1339,6 @@
 				7183E9071CF29F4500524787 /* PulldownMenu.m in Sources */,
 				7183E9E31CF29FCB00524787 /* WebViewController.m in Sources */,
 				7183E9FC1CF29FCB00524787 /* RATreeView+TableViewDelegate.m in Sources */,
-				7183EA371CF29FCB00524787 /* OfflineSettingViewController.m in Sources */,
 				7183E9101CF29F4500524787 /* CommonEditorCellEdit.m in Sources */,
 				7183EA101CF29FCB00524787 /* HomeTableViewCellSlide.m in Sources */,
 				7183E91C1CF29F4500524787 /* EnumSelectViewController.m in Sources */,
@@ -1372,6 +1385,7 @@
 				7183E9FE1CF29FCB00524787 /* RAViewController.m in Sources */,
 				7183EA001CF29FCB00524787 /* ContactAdvanceSearchViewController.m in Sources */,
 				7183E9E81CF29FCB00524787 /* BundleModelCell.m in Sources */,
+				71BF07011D2F3CCC00981938 /* OLDataProvider.m in Sources */,
 				7183E8971CF29F3900524787 /* zip.c in Sources */,
 				7183EA1A1CF29FCB00524787 /* OrderListViewController.m in Sources */,
 				7183E91A1CF29F4500524787 /* DatePickerViewController.m in Sources */,
@@ -1398,6 +1412,7 @@
 				7183EA0D1CF29FCB00524787 /* LineView.m in Sources */,
 				7183E9161CF29F4500524787 /* CommonEditorCellSignature.m in Sources */,
 				7183E9F71CF29FCB00524787 /* RATreeNodeInfo+Private.m in Sources */,
+				71BF07051D2F3CF300981938 /* OfflineSettingViewController.m in Sources */,
 				7183E9011CF29F4500524787 /* CustomIOSAlertView.m in Sources */,
 				7183E8951CF29F3900524787 /* mztools.c in Sources */,
 				7183EA301CF29FCB00524787 /* PopupNavigationController.m in Sources */,

binární
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/Ray.xcuserdatad/UserInterfaceState.xcuserstate


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 398 - 280
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist


+ 19 - 2
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Expressions.xcexplist

@@ -3,13 +3,22 @@
    version = "1.0">
    <ContextStates>
       <ContextState
-         contextName = "__30-[DetailHeaderCell addtocart:]_block_invoke_3:DetailHeaderCell.m">
+         contextName = "-[NSData(LowLevelCommonCryptor) dataEncryptedUsingAlgorithm:key:initializationVector:options:error:]:NSData+CommonCrypto.m">
+      </ContextState>
+      <ContextState
+         contextName = "-[AppDelegate connectionDidFinishLoading:]:AppDelegate.m">
+      </ContextState>
+      <ContextState
+         contextName = "-[NSData(LowLevelCommonCryptor) _runCryptor:result:]:NSData+CommonCrypto.m">
          <PersistentStrings>
             <PersistentString
-               value = "self.cqty">
+               value = "[self bytes]">
             </PersistentString>
          </PersistentStrings>
       </ContextState>
+      <ContextState
+         contextName = "+[RAUtils arr2string:separator:trim:]:RAUtils.m">
+      </ContextState>
       <ContextState
          contextName = "-[FunctionTestViewController printInteractionController:choosePaper:]:FunctionTestViewController.m">
          <PersistentStrings>
@@ -18,5 +27,13 @@
             </PersistentString>
          </PersistentStrings>
       </ContextState>
+      <ContextState
+         contextName = "__30-[DetailHeaderCell addtocart:]_block_invoke_3:DetailHeaderCell.m">
+         <PersistentStrings>
+            <PersistentString
+               value = "self.cqty">
+            </PersistentString>
+         </PersistentStrings>
+      </ContextState>
    </ContextStates>
 </VariablesViewState>

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

@@ -8,7 +8,6 @@
 
 /* Begin PBXBuildFile section */
 		710274251CC606C4009FD219 /* UserListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 710274241CC606C4009FD219 /* UserListViewController.m */; };
-		71098A421CE32C1B0078E878 /* OfflineSettingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71098A411CE32C1B0078E878 /* OfflineSettingViewController.m */; };
 		7111E5721C76C557004763B3 /* customer_info_template_edit.json in Resources */ = {isa = PBXBuildFile; fileRef = 7111E5711C76C557004763B3 /* customer_info_template_edit.json */; };
 		71131F921CA1372300DBF6E2 /* SimplifiedBuyingProgramViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71131F911CA1372300DBF6E2 /* SimplifiedBuyingProgramViewController.m */; };
 		712BABF31C897E3A0007466B /* CategorySearchFilterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 712BABF21C897E3A0007466B /* CategorySearchFilterViewController.m */; };
@@ -136,6 +135,9 @@
 		71BBA2411CEAEF0700C91DED /* mztools.c in Sources */ = {isa = PBXBuildFile; fileRef = 71BBA23A1CEAEF0700C91DED /* mztools.c */; };
 		71BBA2421CEAEF0700C91DED /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = 71BBA23C1CEAEF0700C91DED /* unzip.c */; };
 		71BBA2431CEAEF0700C91DED /* zip.c in Sources */ = {isa = PBXBuildFile; fileRef = 71BBA23E1CEAEF0700C91DED /* zip.c */; };
+		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 */; };
 		71D0344F1C9BF3C400E0F7AD /* PortfolioEditQTYViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71D0344E1C9BF3C400E0F7AD /* PortfolioEditQTYViewController.m */; };
 		71D30A211CFBEDC6006F9477 /* default_appearance.json in Resources */ = {isa = PBXBuildFile; fileRef = 71D30A201CFBEDC6006F9477 /* default_appearance.json */; };
 		71D30A2D1CFC0EF8006F9477 /* DefaultImageButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 71D30A2C1CFC0EF8006F9477 /* DefaultImageButton.m */; };
@@ -181,7 +183,6 @@
 		71DF74981C57614C00F2789C /* PhotoStackViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71DF74941C57614C00F2789C /* PhotoStackViewController.m */; };
 		71FFBBE91C60894900D91DC2 /* iSalesDB.m in Sources */ = {isa = PBXBuildFile; fileRef = 71FFBBE61C60894900D91DC2 /* iSalesDB.m */; };
 		71FFBBEA1C60894900D91DC2 /* iSalesNetwork.m in Sources */ = {isa = PBXBuildFile; fileRef = 71FFBBE81C60894900D91DC2 /* iSalesNetwork.m */; };
-		71FFBBF31C6096F300D91DC2 /* OLDataProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 71FFBBF21C6096F300D91DC2 /* OLDataProvider.m */; };
 		A31E80CF7BEA220BD1CC4B97 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C694180C757B34E24180D628 /* libPods.a */; };
 /* End PBXBuildFile section */
 
@@ -190,8 +191,6 @@
 		6C826876B24EFB83AC94A464 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
 		710274231CC606C4009FD219 /* UserListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UserListViewController.h; path = common/Functions/sidemenu/UserListViewController.h; sourceTree = SOURCE_ROOT; };
 		710274241CC606C4009FD219 /* UserListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = UserListViewController.m; path = common/Functions/sidemenu/UserListViewController.m; sourceTree = SOURCE_ROOT; };
-		71098A401CE32C1B0078E878 /* OfflineSettingViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OfflineSettingViewController.h; sourceTree = "<group>"; };
-		71098A411CE32C1B0078E878 /* OfflineSettingViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OfflineSettingViewController.m; sourceTree = "<group>"; };
 		7111E5711C76C557004763B3 /* customer_info_template_edit.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = customer_info_template_edit.json; path = common/Functions/contact/customer_info_template_edit.json; sourceTree = SOURCE_ROOT; };
 		71131F901CA1372300DBF6E2 /* SimplifiedBuyingProgramViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SimplifiedBuyingProgramViewController.h; path = common/Functions/sidemenu/SimplifiedBuyingProgramViewController.h; sourceTree = SOURCE_ROOT; };
 		71131F911CA1372300DBF6E2 /* SimplifiedBuyingProgramViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SimplifiedBuyingProgramViewController.m; path = common/Functions/sidemenu/SimplifiedBuyingProgramViewController.m; sourceTree = SOURCE_ROOT; };
@@ -432,6 +431,12 @@
 		71BBA23D1CEAEF0700C91DED /* unzip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = unzip.h; path = common/zip/minizip/unzip.h; sourceTree = SOURCE_ROOT; };
 		71BBA23E1CEAEF0700C91DED /* zip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = zip.c; path = common/zip/minizip/zip.c; sourceTree = SOURCE_ROOT; };
 		71BBA23F1CEAEF0700C91DED /* zip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = zip.h; path = common/zip/minizip/zip.h; sourceTree = SOURCE_ROOT; };
+		71BF06F91D2F3CAC00981938 /* OLDataProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OLDataProvider.h; path = common/Functions/offline/OLDataProvider.h; sourceTree = SOURCE_ROOT; };
+		71BF06FA1D2F3CAC00981938 /* OLDataProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OLDataProvider.m; path = common/Functions/offline/OLDataProvider.m; sourceTree = SOURCE_ROOT; };
+		71BF06FC1D2F3CBA00981938 /* OfflineSettingViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OfflineSettingViewController.h; path = common/Functions/offline/OfflineSettingViewController.h; sourceTree = SOURCE_ROOT; };
+		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; };
 		71D0344D1C9BF3C400E0F7AD /* PortfolioEditQTYViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PortfolioEditQTYViewController.h; path = common/Functions/portfolio/PortfolioEditQTYViewController.h; sourceTree = SOURCE_ROOT; };
 		71D0344E1C9BF3C400E0F7AD /* PortfolioEditQTYViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PortfolioEditQTYViewController.m; path = common/Functions/portfolio/PortfolioEditQTYViewController.m; sourceTree = SOURCE_ROOT; };
 		71D30A201CFBEDC6006F9477 /* default_appearance.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = default_appearance.json; sourceTree = "<group>"; };
@@ -517,8 +522,6 @@
 		71FFBBE61C60894900D91DC2 /* iSalesDB.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = iSalesDB.m; path = common/data_provider/iSalesDB.m; sourceTree = SOURCE_ROOT; };
 		71FFBBE71C60894900D91DC2 /* iSalesNetwork.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iSalesNetwork.h; path = common/data_provider/iSalesNetwork.h; sourceTree = SOURCE_ROOT; };
 		71FFBBE81C60894900D91DC2 /* iSalesNetwork.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = iSalesNetwork.m; path = common/data_provider/iSalesNetwork.m; sourceTree = SOURCE_ROOT; };
-		71FFBBF11C6096F300D91DC2 /* OLDataProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OLDataProvider.h; sourceTree = "<group>"; };
-		71FFBBF21C6096F300D91DC2 /* OLDataProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OLDataProvider.m; sourceTree = "<group>"; };
 		C694180C757B34E24180D628 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
@@ -638,6 +641,7 @@
 				719E45D71B63883100FD098B /* DetailView */,
 				71DBACEE1B5E401A00D8BD7E /* HomeView */,
 				714C6AE21B83107A000123E3 /* order */,
+				717AE10B1D1A5E99007DC5CA /* offline */,
 				711A551F1C153AA800EF5FDA /* portfolio */,
 				714A52061995E90300627D23 /* cam_scan */,
 				71A2478A1B955448000E1F84 /* search */,
@@ -788,8 +792,8 @@
 				71FFBBE61C60894900D91DC2 /* iSalesDB.m */,
 				71FFBBE71C60894900D91DC2 /* iSalesNetwork.h */,
 				71FFBBE81C60894900D91DC2 /* iSalesNetwork.m */,
-				71FFBBF11C6096F300D91DC2 /* OLDataProvider.h */,
-				71FFBBF21C6096F300D91DC2 /* OLDataProvider.m */,
+				71BF06F91D2F3CAC00981938 /* OLDataProvider.h */,
+				71BF06FA1D2F3CAC00981938 /* OLDataProvider.m */,
 			);
 			name = utils;
 			sourceTree = "<group>";
@@ -817,8 +821,6 @@
 				71131F911CA1372300DBF6E2 /* SimplifiedBuyingProgramViewController.m */,
 				710274231CC606C4009FD219 /* UserListViewController.h */,
 				710274241CC606C4009FD219 /* UserListViewController.m */,
-				71098A401CE32C1B0078E878 /* OfflineSettingViewController.h */,
-				71098A411CE32C1B0078E878 /* OfflineSettingViewController.m */,
 			);
 			name = sideMenu;
 			sourceTree = "<group>";
@@ -860,6 +862,17 @@
 			name = categoryMenu;
 			sourceTree = "<group>";
 		};
+		717AE10B1D1A5E99007DC5CA /* offline */ = {
+			isa = PBXGroup;
+			children = (
+				71BF06FC1D2F3CBA00981938 /* OfflineSettingViewController.h */,
+				71BF06FD1D2F3CBA00981938 /* OfflineSettingViewController.m */,
+				71BF07061D2F3D2800981938 /* SyncControlPanelViewController.h */,
+				71BF07071D2F3D2800981938 /* SyncControlPanelViewController.m */,
+			);
+			name = offline;
+			sourceTree = "<group>";
+		};
 		7185C3CE1B919C7200B4823C /* contact */ = {
 			isa = PBXGroup;
 			children = (
@@ -1303,6 +1316,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				7141DD531C57459B00F7DF59 /* qrspec.c in Sources */,
+				71BF07081D2F3D2800981938 /* SyncControlPanelViewController.m in Sources */,
 				71FFBBEA1C60894900D91DC2 /* iSalesNetwork.m in Sources */,
 				7162A59D1C58733400AB630E /* OrderDetailViewController.m in Sources */,
 				7141DD3B1C5726B700F7DF59 /* DeviceInfo.m in Sources */,
@@ -1320,7 +1334,6 @@
 				7162A5E31C5877CE00AB630E /* WatchListViewController.m in Sources */,
 				715001FF1D114D9100F5927F /* BundleDetailButton.m in Sources */,
 				7162A5421C58719D00AB630E /* RATreeNodeCollectionController.m in Sources */,
-				71FFBBF31C6096F300D91DC2 /* OLDataProvider.m in Sources */,
 				71DF74631C575E7900F2789C /* CommonEditorCellSwitch.m in Sources */,
 				7162A5DE1C5876E300AB630E /* RetrievePassViewController.m in Sources */,
 				7141DD541C57459B00F7DF59 /* rscode.c in Sources */,
@@ -1357,7 +1370,6 @@
 				7162A5731C58728D00AB630E /* DetailTopicCell.m in Sources */,
 				71BBA2421CEAEF0700C91DED /* unzip.c in Sources */,
 				7162A5AA1C58735900AB630E /* PDFListTableViewCell.m in Sources */,
-				71098A421CE32C1B0078E878 /* OfflineSettingViewController.m in Sources */,
 				7162A5AC1C58735900AB630E /* PortfolioViewController.m in Sources */,
 				71DF748C1C57608F00F2789C /* StrikethroughLabel.m in Sources */,
 				7162A5981C58733400AB630E /* CreateOrderViewController.m in Sources */,
@@ -1371,6 +1383,7 @@
 				71D0344F1C9BF3C400E0F7AD /* PortfolioEditQTYViewController.m in Sources */,
 				7162A5B51C58738600AB630E /* ScannerViewController.m in Sources */,
 				713F76BA1929F4A7006A7305 /* AppDelegate.m in Sources */,
+				71BF06FB1D2F3CAC00981938 /* OLDataProvider.m in Sources */,
 				7162A59B1C58733400AB630E /* OrderDetailModelCell.m in Sources */,
 				7162A5E91C5899F700AB630E /* MainViewController.m in Sources */,
 				7141DD4F1C57459B00F7DF59 /* mask.c in Sources */,
@@ -1428,6 +1441,7 @@
 				71DF74861C57608F00F2789C /* ImageViewController.m in Sources */,
 				7162A5821C5872EF00AB630E /* HomeTableViewCellButtonBanner.m in Sources */,
 				713F76B61929F4A7006A7305 /* main.m in Sources */,
+				71BF06FE1D2F3CBA00981938 /* OfflineSettingViewController.m in Sources */,
 				71DF74611C575E7900F2789C /* CommonEditorCellModel.m in Sources */,
 				71DF74341C5757DA00F2789C /* ActiveViewController.m in Sources */,
 				7162A5431C58719D00AB630E /* RATreeNodeInfo.m in Sources */,

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů