ソースを参照

NPD MOBILE

IMAGE UPLOAD 界面提取为公共模块。
Ray Zhang 8 年 前
コミット
6bf59e408f

+ 7 - 7
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -31,7 +31,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1087"
             endingLineNumber = "1087"
-            landmarkName = "-selectorOnClick:"
+            landmarkName = "-setSelected:animated:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -63,8 +63,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1088"
             endingLineNumber = "1088"
-            landmarkName = "DetailHeaderCell"
-            landmarkType = "3">
+            landmarkName = "-setSelected:animated:"
+            landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -367,7 +367,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1161"
             endingLineNumber = "1161"
-            landmarkName = "-photoStackView:didSelectPhotoAtIndex:"
+            landmarkName = "-createVideoView:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -415,7 +415,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "628"
             endingLineNumber = "628"
-            landmarkName = "-addtocart:"
+            landmarkName = "-Hide_selector:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -502,7 +502,7 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/modelDetail/DetailHeaderCell.m"
@@ -511,7 +511,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "625"
             endingLineNumber = "625"
-            landmarkName = "-addtocart:"
+            landmarkName = "-Hide_selector:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

+ 9 - 2
RedAnt ERP Mobile/common/customUI/ImageUploadViewController.m

@@ -14,9 +14,13 @@
 #import "config.h"
 #import "RAUtils.h"
 #import "AppDelegate.h"
+#ifdef OFFLINE_MODE
 #import "OLDataProvider.h"
+#endif
+#ifdef GOOGLE_ANALYTICS
 #import "ERPUtils.h"
-#import "iSalesNetwork.h"
+#endif
+//#import "iSalesNetwork.h"
 #import "NetworkUtils.h"
 
 //#import "UIAlertView+AFNetworking.h"
@@ -254,9 +258,12 @@
         
         //    UIAlertView * waitalert = [[UIAlertView alloc] initWithTitle:@"wait" message:@"uploading" delegate:nil cancelButtonTitle:nil otherButtonTitles:nil, nil];
         //    [waitalert show];
-        
+   
+#ifdef GOOGLE_ANALYTICS
+        NSString *const ScreenCodeUploadImage = @"Upload Image Screen";
         [ERPUtils googleAnalyticsSendRequestString:nil WithScreen:ScreenCodeUploadImage Action:nil Extra:nil];
         
+#endif
         NSData *imageData = UIImagePNGRepresentation(self.imgview.image);
         
         NSMutableDictionary* params = [[NSMutableDictionary alloc] init];

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

@@ -1872,6 +1872,7 @@
 				ORGANIZATIONNAME = "United Software Applications, Inc";
 				TargetAttributes = {
 					713F76A51929F4A7006A7305 = {
+						DevelopmentTeam = HXWLAA5YN5;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -2303,7 +2304,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/GoogleAnalytics/FirebaseAnalytics/Frameworks",
@@ -2346,7 +2347,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/GoogleAnalytics/FirebaseAnalytics/Frameworks",

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

@@ -25,6 +25,7 @@
 
 
 #define OFFLINE_MODE
+#define GOOGLE_ANALYTICS
 #define PDF_DEBUG false
 
 //#define ENCRYPT_OFF