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

HMLG Scan Order 1.38
fix release can not register apn issue

Ray Zhang 2 лет назад
Родитель
Сommit
c14f20037f

+ 2 - 2
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 = 53397;
+				CURRENT_PROJECT_VERSION = 54350;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -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 = 53397;
+				CURRENT_PROJECT_VERSION = 54350;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

+ 3 - 3
RedAnt ERP Mobile/HMLG Scan Order/Base.lproj/Main.storyboard

@@ -3,7 +3,7 @@
     <device id="ipad7_9" orientation="portrait" layout="fullscreen" appearance="light"/>
     <dependencies>
         <deployment version="5696" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -1970,7 +1970,7 @@ Email: redantsupport@united-us.net</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xBk-1n-UFG">
-                                                    <rect key="frame" x="0.0" y="0.5" width="430" height="42.5"/>
+                                                    <rect key="frame" x="16" y="0.5" width="414" height="42.5"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
@@ -2003,7 +2003,7 @@ Email: redantsupport@united-us.net</string>
                                                 <constraint firstItem="xBk-1n-UFG" firstAttribute="top" secondItem="6ok-87-DrJ" secondAttribute="top" constant="0.5" id="jhX-tI-J2i"/>
                                                 <constraint firstAttribute="bottomMargin" secondItem="oBw-iB-pSQ" secondAttribute="bottom" constant="1.5" id="kb8-gI-GN0"/>
                                                 <constraint firstItem="ahn-8c-uI7" firstAttribute="top" secondItem="6ok-87-DrJ" secondAttribute="top" constant="4.5" id="v00-PB-08h"/>
-                                                <constraint firstItem="xBk-1n-UFG" firstAttribute="leading" secondItem="6ok-87-DrJ" secondAttribute="leading" id="xNk-LU-pfL"/>
+                                                <constraint firstItem="xBk-1n-UFG" firstAttribute="leading" secondItem="6ok-87-DrJ" secondAttribute="leading" constant="16" id="xNk-LU-pfL"/>
                                             </constraints>
                                         </tableViewCellContentView>
                                         <connections>

+ 4 - 0
RedAnt ERP Mobile/HMLG Scan Order/HMLG Scan Order-Info.plist

@@ -42,6 +42,10 @@
 		<string>DejaVuSans.ttf</string>
 		<string>DejaVuSans-Bold.ttf</string>
 	</array>
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>remote-notification</string>
+	</array>
 	<key>UILaunchStoryboardName</key>
 	<string>Launch Screen</string>
 	<key>UIMainStoryboardFile</key>

+ 1 - 1
RedAnt ERP Mobile/HMLG Scan Order/config.h

@@ -68,7 +68,7 @@
 
 
 
-#define BASE_URL @"http://192.168.0.142:8088/wm_postgresql/"
+#define BASE_URL @"http://192.168.0.112:8088/wm_postgresql/"
 
 //------------------- chen server-----------------------
 

+ 4 - 2
RedAnt ERP Mobile/common/Functions/camscan/ScannerViewController.m

@@ -435,8 +435,10 @@
     self.scanButton.layer.borderColor = [[UIColor darkGrayColor] CGColor];
     self.scanButton.layer.borderWidth = 15;
     // Start the AVSession running
-    [session startRunning];
-    
+   
+    dispatch_async(dispatch_get_global_queue(0, 0), ^{
+        [session startRunning];
+    });
 #ifdef BUILD_UWAVER
     
     [self.targetButton setTitle:@"Target: Model Detail" forState:UIControlStateNormal];