HMLG Scan Order 1.39

fix notification can not pop up issue

RedAnt ERP Mobile/HMLG Scan Order.xcodeproj/project.pbxproj

@@ -2523,7 +2523,7 @@
 				CODE_SIGN_ENTITLEMENTS = "HMLG Scan Order/HMLG Scan Order.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 54371;
+				CURRENT_PROJECT_VERSION = 54382;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2540,7 +2540,7 @@
 					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",
 					"$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries",
 				);
-				MARKETING_VERSION = 1.38;
+				MARKETING_VERSION = 1.39;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -2573,7 +2573,7 @@
 				CODE_SIGN_ENTITLEMENTS = "HMLG Scan Order/HMLG Scan Order.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 54371;
+				CURRENT_PROJECT_VERSION = 54382;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2590,7 +2590,7 @@
 					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",
 					"$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries",
 				);
-				MARKETING_VERSION = 1.38;
+				MARKETING_VERSION = 1.39;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

RedAnt ERP Mobile/HMLG Scan Order/AppDelegate.m

@@ -68,13 +68,15 @@
         return; // 不处理后台时的推送，避免重复推送
     }
     
-    self.occupied = true;
+
     if(application.applicationState == UIApplicationStateInactive)
     {
         completionHandler(UIBackgroundFetchResultNoData);
         return; // 不处理后台时的推送，避免重复推送
     }
     
+    self.occupied = true;
+    
     UIViewController *vc = [RAUtils getCurrentVC];
     
     NSString * name=NSStringFromClass(vc.class);

RedAnt ERP Mobile/HMLG Scan Order/config.h

@@ -17,7 +17,7 @@
 #define RA_NOTIFICATION
 
 # ifdef DEBUG
-//#define test_server
+#define test_server
 # endif
 
 #define exception_switch 1

RedAnt ERP Mobile/common/data_provider/RANetwork.m

@@ -101,6 +101,10 @@ NSString *const ScreenCodeOfflineSync = @"Offline Sync Screen";
     if(RASingleton.sharedInstance.duid!=nil && params[@"udid"]==nil)
         params[@"udid"]=RASingleton.sharedInstance.duid;
 
+    #if TARGET_IPHONE_SIMULATOR//模拟器
+        params[@"udid"]=@"simulator";
+    #endif
+    
 # ifdef DEBUG
     [params setValue:@"true" forKey:@"is_debug"];
 # endif