Просмотр исходного кода

1.修改Homer,屏蔽NPD信息。

Pen Li 8 лет назад
Родитель
Сommit
da061ed958

BIN
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/macmini1.xcuserdatad/UserInterfaceState.xcuserstate


+ 12 - 0
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/macmini1.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -2,4 +2,16 @@
 <Bucket
    type = "0"
    version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            scope = "0"
+            stopOnStyle = "0">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
 </Bucket>

+ 5 - 1
RedAnt ERP Mobile/common/Functions/MainViewController.m

@@ -466,9 +466,13 @@
 
 #ifdef BUILD_HMLG
     NSString* versionNum = [NSString stringWithFormat:@"HMLG %@ Build %@",version,build];
-#else
+#endif
+#ifdef BUILD_NPD
     NSString* versionNum = [NSString stringWithFormat:@"npd %@ Build %@",version,build];
 #endif
+#ifdef BUILD_HOMER
+    NSString* versionNum = [NSString stringWithFormat:@"HOMER %@ Build %@",version,build];
+#endif
     
     [self initMenuItems];
     self.homeViewController =[ self.storyboard instantiateViewControllerWithIdentifier:@"HomeViewController"];

+ 7 - 0
RedAnt ERP Mobile/common/Functions/cart/CartViewController.m

@@ -2881,7 +2881,14 @@ commitEditingStyle:(UITableViewCellEditingStyle)editingStyle  forRowAtIndexPath:
     }
     ViewController.mail_to = send_to;
     
+#ifdef BUILD_HOMER
+    ViewController.filename = [NSString stringWithFormat:@"HOMER_Product_List.pdf"];
+#endif
+
+#ifdef BUILD_NPD
     ViewController.filename = [NSString stringWithFormat:@"NPD_Product_List.pdf"];
+#endif
+    
     ViewController.mail_subject = subject;
     
     ViewController.hidenavi = false;

+ 4 - 0
RedAnt ERP Mobile/common/Functions/search+itemsearch/SearchViewController.m

@@ -97,6 +97,10 @@
     
     NSMutableDictionary* items =[[self.category_data objectForKey:@"items"] mutableCopy];
     
+    if (items == nil) {
+        items = [NSMutableDictionary dictionary];
+        [items setObject:@(0) forKey:@"count"];
+    }
     int count = [[items valueForKey:@"count"] intValue];
     
     for(int i=0;i<count;i++)

+ 7 - 0
RedAnt ERP Mobile/common/Functions/sidemenu/LoginViewController.m

@@ -40,6 +40,13 @@
     self.checkOfflineMode.hidden=true;
     self.requestLoginBtn.hidden = YES;
 #endif
+    
+#ifdef BUILD_HOMER
+    self.title=@"HOMER";
+    self.checkOfflineMode.hidden=true;
+    self.requestLoginBtn.hidden = YES;
+#endif
+    
 #ifdef BUILD_NPD
     self.title=@"NPD";
     self.checkOfflineMode.hidden=false;

+ 6 - 0
RedAnt ERP Mobile/common/Functions/watchlist/WatchListViewController.m

@@ -1320,7 +1320,13 @@ commitEditingStyle:(UITableViewCellEditingStyle)editingStyle  forRowAtIndexPath:
     ViewController.mail_to = send_to;
     
     //    ViewController.attachment_name = [NSString stringWithFormat:@"NPD_Wish_List %@.pdf",cur_time];
+#ifdef BUILD_HOMER
+    ViewController.filename = [NSString stringWithFormat:@"HOMER_Wish_List.pdf"];
+#endif
+    
+#ifdef BUILD_NPD
     ViewController.filename = [NSString stringWithFormat:@"NPD_Wish_List.pdf"];
+#endif
     ViewController.mail_subject = subject;
     
     ViewController.hidenavi = false;

+ 5 - 4
RedAnt ERP Mobile/iSales-HOMER/config.h

@@ -9,7 +9,11 @@
 #ifndef RedAnt_ERP_Mobile_config_h
 #define RedAnt_ERP_Mobile_config_h
 #define BUILD_HOMER
-#define COMPANY_SHORT_NAME "HOMER"
+
+#define  APP_NAME @"HOMER Mobile"
+#define  COMPANY_SHORT_NAME @"HOMER"
+#define  COMPANY_NAME @"HOMELEGANCE LA, INC."
+#define  COMPANY_INFO @"Sales: homerica@homelegance.com\nPhone: 888/458-1688"
 
 # ifdef DEBUG
 #define test_server
@@ -32,9 +36,6 @@
  
 #define CONTACT_LIST 1
 
-#define  APP_NAME @"Homer Mobile"
-#define  COMPANY_NAME @"New Pacific Direct"
-#define  COMPANY_INFO @"Sales: sales@newpacificdirect.com\nPhone: 510.818.9388"
 
 #define LOCAL_URL_CUSTOMER_INFO_EDITOR @"customer_info_template"
 #define LOCAL_URL_CUSTOMER_INFO_EDIT @"customer_info_template_edit"