소스 검색

hmlg scan order commit

Ray Zhang 1 개월 전
부모
커밋
4cc68e7604

+ 2 - 2
Ants Contract/Granite Expo eSign/Granite Expo eSign.xcodeproj/project.pbxproj

@@ -953,7 +953,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CURRENT_PROJECT_VERSION = 54100;
+				CURRENT_PROJECT_VERSION = 57526;
 				INFOPLIST_FILE = "Granite Expo eSign/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -970,7 +970,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CURRENT_PROJECT_VERSION = 54100;
+				CURRENT_PROJECT_VERSION = 57526;
 				INFOPLIST_FILE = "Granite Expo eSign/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (

+ 2 - 2
RA TradeFiling/RA TradeFiling.xcodeproj/project.pbxproj

@@ -2153,7 +2153,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 56280;
+				CURRENT_PROJECT_VERSION = 57526;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				INFOPLIST_FILE = "RA TradeFiling/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
@@ -2174,7 +2174,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 56280;
+				CURRENT_PROJECT_VERSION = 57526;
 				GCC_OPTIMIZATION_LEVEL = s;
 				INFOPLIST_FILE = "RA TradeFiling/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;

+ 2 - 2
RedAnt ERP Mobile/HMLG Scan Order.xcodeproj/project.pbxproj

@@ -2493,7 +2493,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 = 57133;
+				CURRENT_PROJECT_VERSION = 58050;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/GoogleAnalytics/FirebaseAnalytics/Frameworks",
@@ -2539,7 +2539,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 = 57133;
+				CURRENT_PROJECT_VERSION = 58050;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/GoogleAnalytics/FirebaseAnalytics/Frameworks",

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

@@ -2343,7 +2343,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 2558040;
+				CURRENT_PROJECT_VERSION = 2558050;
 				EXCLUDED_ARCHS = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2406,7 +2406,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 2558040;
+				CURRENT_PROJECT_VERSION = 2558050;
 				EXCLUDED_ARCHS = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

+ 9 - 0
common/customUI/CommonEditoriPad/iPadCommonEditorCellLabel.xib

@@ -24,13 +24,22 @@
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="d06-Qs-lLk">
+                        <rect key="frame" x="15" y="11.5" width="42" height="21"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <nil key="textColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
                 </subviews>
                 <constraints>
+                    <constraint firstItem="d06-Qs-lLk" firstAttribute="leading" secondItem="1gG-px-9wA" secondAttribute="leading" constant="15" id="6yd-la-j9O"/>
                     <constraint firstItem="B4j-tW-HM9" firstAttribute="centerY" secondItem="1gG-px-9wA" secondAttribute="centerY" id="gNq-tD-5k4"/>
+                    <constraint firstItem="B4j-tW-HM9" firstAttribute="centerY" secondItem="d06-Qs-lLk" secondAttribute="centerY" id="nir-Gb-TVU"/>
                     <constraint firstAttribute="trailing" secondItem="B4j-tW-HM9" secondAttribute="trailing" constant="15" id="wFb-Xo-7jS"/>
                 </constraints>
             </tableViewCellContentView>
             <connections>
+                <outlet property="labelTitle" destination="d06-Qs-lLk" id="nn9-wE-hrl"/>
                 <outlet property="labelValue" destination="B4j-tW-HM9" id="l7Q-c4-eeu"/>
             </connections>
             <point key="canvasLocation" x="132" y="154"/>