Ver código fonte

crm 1.18 更换图标,增加启动界面,iOS14 适配

Ray Zhang 5 anos atrás
pai
commit
ffef95370b
35 arquivos alterados com 152 adições e 103 exclusões
  1. 9 15
      RedAnt CRM/APEX CRM/APEX CRM.xcodeproj/project.pbxproj
  2. 57 57
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/Contents.json
  3. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-10.png
  4. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-11.png
  5. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-12.png
  6. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-13.png
  7. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-14.png
  8. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-15.png
  9. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-16.png
  10. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-17.png
  11. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-2.png
  12. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-3.png
  13. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-4.png
  14. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-5.png
  15. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-6.png
  16. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-7.png
  17. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-8.png
  18. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon.png
  19. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/google_md_icon_grid-08iPhoneApp_60pt@2x.png
  20. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/google_md_icon_grid-08iPhoneApp_60pt@3x.png
  21. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/google_md_icon_grid-08iPhoneNotification_20pt@2x.png
  22. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/google_md_icon_grid-08iPhoneNotification_20pt@3x.png
  23. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/google_md_icon_grid-08iPhoneSpootlight5_29pt@2x.png
  24. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/google_md_icon_grid-08iPhoneSpootlight5_29pt@3x.png
  25. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/google_md_icon_grid-08iPhoneSpootlight7_40pt@2x.png
  26. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/google_md_icon_grid-08iPhoneSpootlight7_40pt@3x.png
  27. 3 3
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/Contents.json
  28. 23 0
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/kerry-apex.imageset/Contents.json
  29. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/kerry-apex.imageset/kerry apex-11.png
  30. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/kerry-apex.imageset/kerry apex-11@2x.png
  31. BIN
      RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/kerry-apex.imageset/kerry apex-11@3x.png
  32. 0 25
      RedAnt CRM/APEX CRM/APEX CRM/Base.lproj/LaunchScreen.storyboard
  33. 2 2
      RedAnt CRM/APEX CRM/APEX CRM/Info.plist
  34. 58 0
      RedAnt CRM/APEX CRM/APEX CRM/Launch Screen.storyboard
  35. 0 1
      RedAnt CRM/APEX CRM/APEX CRM/zh-Hans.lproj/LaunchScreen.strings

+ 9 - 15
RedAnt CRM/APEX CRM/APEX CRM.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		3C4000272519D818008F0DA3 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3C4000262519D818008F0DA3 /* Launch Screen.storyboard */; };
 		4212AB8E21AD22AB00BE4E45 /* QRCode.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4212AB8121AD22AA00BE4E45 /* QRCode.storyboard */; };
 		4212AB8F21AD22AB00BE4E45 /* RAQRCodeScannerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4212AB8321AD22AA00BE4E45 /* RAQRCodeScannerViewController.m */; };
 		4212AB9021AD22AB00BE4E45 /* Camera.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4212AB8521AD22AA00BE4E45 /* Camera.storyboard */; };
@@ -58,7 +59,6 @@
 		7106E80D21A684F20056DD20 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7106E80C21A684F20056DD20 /* ViewController.m */; };
 		7106E81021A684F20056DD20 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7106E80E21A684F20056DD20 /* Main.storyboard */; };
 		7106E81221A684F50056DD20 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7106E81121A684F50056DD20 /* Assets.xcassets */; };
-		7106E81521A684F50056DD20 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7106E81321A684F50056DD20 /* LaunchScreen.storyboard */; };
 		7106E81821A684F50056DD20 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 7106E81721A684F50056DD20 /* main.m */; };
 		7106E82221A6856E0056DD20 /* WKWebTestViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7106E81E21A6856E0056DD20 /* WKWebTestViewController.m */; };
 		7106E82621A698D20056DD20 /* RAWKWebView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7106E82521A698D20056DD20 /* RAWKWebView.m */; };
@@ -73,6 +73,7 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		3C4000262519D818008F0DA3 /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = "Launch Screen.storyboard"; path = "APEX CRM/Launch Screen.storyboard"; sourceTree = "<group>"; };
 		4212AB8121AD22AA00BE4E45 /* QRCode.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = QRCode.storyboard; sourceTree = "<group>"; };
 		4212AB8221AD22AA00BE4E45 /* RAQRCodeScannerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RAQRCodeScannerViewController.h; sourceTree = "<group>"; };
 		4212AB8321AD22AA00BE4E45 /* RAQRCodeScannerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RAQRCodeScannerViewController.m; sourceTree = "<group>"; };
@@ -87,7 +88,6 @@
 		4212AB9621AD25C800BE4E45 /* RAPreviewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RAPreviewController.h; sourceTree = "<group>"; };
 		4212AB9721AD25C800BE4E45 /* RAPreviewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RAPreviewController.m; sourceTree = "<group>"; };
 		4212AB9921AD2A7100BE4E45 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Main.strings"; sourceTree = "<group>"; };
-		4212AB9A21AD2A7100BE4E45 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/LaunchScreen.strings"; sourceTree = "<group>"; };
 		4212AB9E21AD2AFE00BE4E45 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		4212ABA021AD2B0000BE4E45 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
 		4212ABA421AD2B7300BE4E45 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -167,7 +167,6 @@
 		7106E80C21A684F20056DD20 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
 		7106E80F21A684F20056DD20 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		7106E81121A684F50056DD20 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
-		7106E81421A684F50056DD20 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		7106E81621A684F50056DD20 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		7106E81721A684F50056DD20 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		7106E81E21A6856E0056DD20 /* WKWebTestViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WKWebTestViewController.m; sourceTree = "<group>"; };
@@ -451,7 +450,6 @@
 				4235D1892201899A00DEB4FB /* CRMRemoteNotificationBroadcast.m */,
 				7106E80E21A684F20056DD20 /* Main.storyboard */,
 				7106E81121A684F50056DD20 /* Assets.xcassets */,
-				7106E81321A684F50056DD20 /* LaunchScreen.storyboard */,
 				7106E81621A684F50056DD20 /* Info.plist */,
 				4212AB9F21AD2AFE00BE4E45 /* InfoPlist.strings */,
 				7106E81721A684F50056DD20 /* main.m */,
@@ -518,6 +516,7 @@
 		7106E7FC21A684F20056DD20 = {
 			isa = PBXGroup;
 			children = (
+				3C4000262519D818008F0DA3 /* Launch Screen.storyboard */,
 				7106E80721A684F20056DD20 /* APEX CRM */,
 				7106E80621A684F20056DD20 /* Products */,
 			);
@@ -630,7 +629,7 @@
 		7106E7FD21A684F20056DD20 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1010;
+				LastUpgradeCheck = 1200;
 				ORGANIZATIONNAME = USAI;
 				TargetAttributes = {
 					7106E80421A684F20056DD20 = {
@@ -669,9 +668,9 @@
 			files = (
 				42F53F9321B651B6008EAEFC /* date.strings in Resources */,
 				42F53F8721B617E4008EAEFC /* Signature.xcassets in Resources */,
+				3C4000272519D818008F0DA3 /* Launch Screen.storyboard in Resources */,
 				42A8A21A21AE8309003B854B /* RAPhotoPreview.xcassets in Resources */,
 				42D49F7D21CC983A004F449E /* qrcode.xcassets in Resources */,
-				7106E81521A684F50056DD20 /* LaunchScreen.storyboard in Resources */,
 				4212AB9D21AD2AFE00BE4E45 /* InfoPlist.strings in Resources */,
 				7106E81221A684F50056DD20 /* Assets.xcassets in Resources */,
 				42F53F8621B617E4008EAEFC /* signature.storyboard in Resources */,
@@ -790,15 +789,6 @@
 			name = Main.storyboard;
 			sourceTree = "<group>";
 		};
-		7106E81321A684F50056DD20 /* LaunchScreen.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				7106E81421A684F50056DD20 /* Base */,
-				4212AB9A21AD2A7100BE4E45 /* zh-Hans */,
-			);
-			name = LaunchScreen.storyboard;
-			sourceTree = "<group>";
-		};
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
@@ -829,6 +819,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -889,6 +880,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -930,6 +922,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 1.18;
 				PRODUCT_BUNDLE_IDENTIFIER = "usai.redant.APEX-CRM";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = 1;
@@ -950,6 +943,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 1.18;
 				PRODUCT_BUNDLE_IDENTIFIER = "usai.redant.APEX-CRM";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = 1;

+ 57 - 57
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,116 +1,116 @@
 {
   "images" : [
     {
-      "size" : "20x20",
+      "filename" : "appicon-10.png",
       "idiom" : "iphone",
-      "filename" : "google_md_icon_grid-08iPhoneNotification_20pt@2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "20x20"
     },
     {
-      "size" : "20x20",
+      "filename" : "appicon-11.png",
       "idiom" : "iphone",
-      "filename" : "google_md_icon_grid-08iPhoneNotification_20pt@3x.png",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "20x20"
     },
     {
-      "size" : "29x29",
+      "filename" : "appicon-12.png",
       "idiom" : "iphone",
-      "filename" : "google_md_icon_grid-08iPhoneSpootlight5_29pt@2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "29x29"
     },
     {
-      "size" : "29x29",
+      "filename" : "appicon-13.png",
       "idiom" : "iphone",
-      "filename" : "google_md_icon_grid-08iPhoneSpootlight5_29pt@3x.png",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "29x29"
     },
     {
-      "size" : "40x40",
+      "filename" : "appicon-14.png",
       "idiom" : "iphone",
-      "filename" : "google_md_icon_grid-08iPhoneSpootlight7_40pt@2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "40x40"
     },
     {
-      "size" : "40x40",
+      "filename" : "appicon-15.png",
       "idiom" : "iphone",
-      "filename" : "google_md_icon_grid-08iPhoneSpootlight7_40pt@3x.png",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "40x40"
     },
     {
-      "size" : "60x60",
+      "filename" : "appicon-16.png",
       "idiom" : "iphone",
-      "filename" : "google_md_icon_grid-08iPhoneApp_60pt@2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "60x60"
     },
     {
-      "size" : "60x60",
+      "filename" : "appicon-17.png",
       "idiom" : "iphone",
-      "filename" : "google_md_icon_grid-08iPhoneApp_60pt@3x.png",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "60x60"
     },
     {
-      "size" : "20x20",
-      "idiom" : "ipad",
       "filename" : "appicon-2.png",
-      "scale" : "1x"
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "20x20"
     },
     {
-      "size" : "20x20",
-      "idiom" : "ipad",
       "filename" : "appicon-3.png",
-      "scale" : "2x"
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "20x20"
     },
     {
-      "size" : "29x29",
-      "idiom" : "ipad",
       "filename" : "appicon-4.png",
-      "scale" : "1x"
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "29x29"
     },
     {
-      "size" : "29x29",
-      "idiom" : "ipad",
       "filename" : "appicon-5.png",
-      "scale" : "2x"
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "29x29"
     },
     {
-      "size" : "40x40",
-      "idiom" : "ipad",
       "filename" : "appicon-6.png",
-      "scale" : "1x"
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "40x40"
     },
     {
-      "size" : "40x40",
-      "idiom" : "ipad",
       "filename" : "appicon-7.png",
-      "scale" : "2x"
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "40x40"
     },
     {
-      "size" : "76x76",
-      "idiom" : "ipad",
       "filename" : "appicon-8.png",
-      "scale" : "1x"
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "76x76"
     },
     {
-      "size" : "76x76",
-      "idiom" : "ipad",
       "filename" : "appicon-9.png",
-      "scale" : "2x"
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "76x76"
     },
     {
-      "size" : "83.5x83.5",
-      "idiom" : "ipad",
       "filename" : "appicon-1.png",
-      "scale" : "2x"
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
     },
     {
-      "size" : "1024x1024",
-      "idiom" : "ios-marketing",
       "filename" : "appicon.png",
-      "scale" : "1x"
+      "idiom" : "ios-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-10.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-11.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-12.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-13.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-14.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-15.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-16.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-17.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-2.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-3.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-4.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-5.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-6.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-7.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon-8.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/appicon.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/google_md_icon_grid-08iPhoneApp_60pt@2x.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/google_md_icon_grid-08iPhoneApp_60pt@3x.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/google_md_icon_grid-08iPhoneNotification_20pt@2x.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/google_md_icon_grid-08iPhoneNotification_20pt@3x.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/google_md_icon_grid-08iPhoneSpootlight5_29pt@2x.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/google_md_icon_grid-08iPhoneSpootlight5_29pt@3x.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/google_md_icon_grid-08iPhoneSpootlight7_40pt@2x.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/AppIcon.appiconset/google_md_icon_grid-08iPhoneSpootlight7_40pt@3x.png


+ 3 - 3
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/Contents.json

@@ -1,6 +1,6 @@
 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

+ 23 - 0
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/kerry-apex.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "kerry apex-11.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "kerry apex-11@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "kerry apex-11@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/kerry-apex.imageset/kerry apex-11.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/kerry-apex.imageset/kerry apex-11@2x.png


BIN
RedAnt CRM/APEX CRM/APEX CRM/Assets.xcassets/kerry-apex.imageset/kerry apex-11@3x.png


+ 0 - 25
RedAnt CRM/APEX CRM/APEX CRM/Base.lproj/LaunchScreen.storyboard

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <scenes>
-        <!--View Controller-->
-        <scene sceneID="EHf-IW-A2E">
-            <objects>
-                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
-                    </view>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="53" y="375"/>
-        </scene>
-    </scenes>
-</document>

+ 2 - 2
RedAnt CRM/APEX CRM/APEX CRM/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.16</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSRequiresIPhoneOS</key>
@@ -32,7 +32,7 @@
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>Upload Photos</string>
 	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
+	<string>Launch Screen</string>
 	<key>UIMainStoryboardFile</key>
 	<string>Main</string>
 	<key>UIRequiredDeviceCapabilities</key>

+ 58 - 0
RedAnt CRM/APEX CRM/APEX CRM/Launch Screen.storyboard

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="EHf-IW-A2E">
+            <objects>
+                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Copyright © 2020 USAI. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="obG-Y5-kRd">
+                                <rect key="frame" x="0.0" y="855.5" width="414" height="20.5"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="kerry-apex" translatesAutoresizingMaskIntoConstraints="NO" id="jZQ-c1-nWs">
+                                <rect key="frame" x="64" y="266.5" width="286" height="107"/>
+                            </imageView>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="CRM" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="GJd-Yh-RWb">
+                                <rect key="frame" x="0.0" y="421.5" width="414" height="43"/>
+                                <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstItem="Bcu-3y-fUS" firstAttribute="centerX" secondItem="obG-Y5-kRd" secondAttribute="centerX" id="5cz-MP-9tL"/>
+                            <constraint firstItem="Bcu-3y-fUS" firstAttribute="trailing" secondItem="jZQ-c1-nWs" secondAttribute="trailing" constant="64" id="8ut-46-O8g"/>
+                            <constraint firstItem="Bcu-3y-fUS" firstAttribute="centerX" secondItem="GJd-Yh-RWb" secondAttribute="centerX" id="Q3B-4B-g5h"/>
+                            <constraint firstItem="jZQ-c1-nWs" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" constant="-128" id="RSh-9u-5WH"/>
+                            <constraint firstItem="obG-Y5-kRd" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" symbolic="YES" id="SfN-ll-jLj"/>
+                            <constraint firstAttribute="bottom" secondItem="obG-Y5-kRd" secondAttribute="bottom" constant="20" id="Y44-ml-fuU"/>
+                            <constraint firstItem="jZQ-c1-nWs" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" constant="64" id="pXu-xH-dac"/>
+                            <constraint firstItem="GJd-Yh-RWb" firstAttribute="top" secondItem="jZQ-c1-nWs" secondAttribute="bottom" constant="48" id="qdO-Us-gM1"/>
+                            <constraint firstItem="GJd-Yh-RWb" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" symbolic="YES" id="x7j-FC-K8j"/>
+                        </constraints>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="53" y="375"/>
+        </scene>
+    </scenes>
+    <resources>
+        <image name="kerry-apex" width="342" height="107"/>
+    </resources>
+</document>

+ 0 - 1
RedAnt CRM/APEX CRM/APEX CRM/zh-Hans.lproj/LaunchScreen.strings

@@ -1 +0,0 @@
-