Merge branch 'master' of https://ac.tastecn.com/github/wormwood-juiceplus/strides

Strides-APP/ios/JuicePlus.xcodeproj/project.pbxproj

@@ -14,6 +14,7 @@
 		38066FC426DE16BF00271DFA /* main.jsbundle in Resources */ = {isa = PBXBuildFile; fileRef = 38066FC226DE16BF00271DFA /* main.jsbundle */; };
 		38066FC526DE16BF00271DFA /* assets in Resources */ = {isa = PBXBuildFile; fileRef = 38066FC326DE16BF00271DFA /* assets */; };
 		3806702826DF20DA00271DFA /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 38066FC926DF20DA00271DFA /* GoogleService-Info.plist */; };
+		3869FBE8299B96AF00B54A73 /* AppCenter-Config.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3869FBE7299B96AE00B54A73 /* AppCenter-Config.plist */; };
 		81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
 		A5707C5E2B88048AC01CD052 /* libPods-JuicePlus.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DB9107F120992435E6CC55BB /* libPods-JuicePlus.a */; };
 		A8CB5874BD86036F4E6DF87A /* libPods-JuicePlus-JuicePlusTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AB9D2CD35A198422C90BC492 /* libPods-JuicePlus-JuicePlusTests.a */; };
@@ -517,6 +518,27 @@
 			remoteGlobalIDString = 91B23470DEB9A986332BEB5034234BC7;
 			remoteInfo = SSZipArchive;
 		};
+		3869FC44299BBAA500B54A73 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 3862FE5D2668D3C90097D3A3 /* Pods.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = F91783AD28315517EB590685D3A72C4E;
+			remoteInfo = "appcenter-analytics";
+		};
+		3869FC46299BBAA500B54A73 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 3862FE5D2668D3C90097D3A3 /* Pods.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 900096B0725CFCC567CC79CB90414A7A;
+			remoteInfo = "appcenter-core";
+		};
+		3869FC48299BBAA500B54A73 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 3862FE5D2668D3C90097D3A3 /* Pods.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 3CE42778BE70CC034137D9A5B65316C1;
+			remoteInfo = "appcenter-crashes";
+		};
 		38C6DA642668E46D00D889BC /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 3862FE5D2668D3C90097D3A3 /* Pods.xcodeproj */;
@@ -564,6 +586,7 @@
 		38066FC326DE16BF00271DFA /* assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = assets; path = bundle/assets; sourceTree = "<group>"; };
 		38066FC926DF20DA00271DFA /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "JuicePlus/GoogleService-Info.plist"; sourceTree = "<group>"; };
 		3862FE5D2668D3C90097D3A3 /* Pods.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = Pods.xcodeproj; sourceTree = "<group>"; };
+		3869FBE7299B96AE00B54A73 /* AppCenter-Config.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "AppCenter-Config.plist"; path = "JuicePlus/AppCenter-Config.plist"; sourceTree = "<group>"; };
 		81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = JuicePlus/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		AB9D2CD35A198422C90BC492 /* libPods-JuicePlus-JuicePlusTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-JuicePlus-JuicePlusTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		B12059D6810CBCE332360003 /* Pods-JuicePlus.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JuicePlus.debug.xcconfig"; path = "Target Support Files/Pods-JuicePlus/Pods-JuicePlus.debug.xcconfig"; sourceTree = "<group>"; };
@@ -619,6 +642,7 @@
 				13B07FB01A68108700A75B9A /* AppDelegate.m */,
 				13B07FB51A68108700A75B9A /* Images.xcassets */,
 				13B07FB61A68108700A75B9A /* Info.plist */,
+				3869FBE7299B96AE00B54A73 /* AppCenter-Config.plist */,
 				38066FC926DF20DA00271DFA /* GoogleService-Info.plist */,
 				81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */,
 				13B07FB71A68108700A75B9A /* main.m */,
@@ -639,6 +663,9 @@
 		3862FE5E2668D3C90097D3A3 /* Products */ = {
 			isa = PBXGroup;
 			children = (
+				3869FC45299BBAA500B54A73 /* appcenter-analytics */,
+				3869FC47299BBAA500B54A73 /* appcenter-core */,
+				3869FC49299BBAA500B54A73 /* appcenter-crashes */,
 				3869FB8A299A2F0000B54A73 /* Base64 */,
 				385053C52970039F0061999F /* BEMCheckBox */,
 				3869FB8C299A2F0000B54A73 /* CodePush */,
@@ -1407,6 +1434,30 @@
 			remoteRef = 3869FB8F299A2F0000B54A73 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		3869FC45299BBAA500B54A73 /* appcenter-analytics */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			name = "appcenter-analytics";
+			path = "libappcenter-analytics.a";
+			remoteRef = 3869FC44299BBAA500B54A73 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		3869FC47299BBAA500B54A73 /* appcenter-core */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			name = "appcenter-core";
+			path = "libappcenter-core.a";
+			remoteRef = 3869FC46299BBAA500B54A73 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		3869FC49299BBAA500B54A73 /* appcenter-crashes */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			name = "appcenter-crashes";
+			path = "libappcenter-crashes.a";
+			remoteRef = 3869FC48299BBAA500B54A73 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		38C6DA652668E46D00D889BC /* Google-Maps-iOS-Utils */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -1458,6 +1509,7 @@
 				3806702826DF20DA00271DFA /* GoogleService-Info.plist in Resources */,
 				81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */,
 				13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
+				3869FBE8299B96AF00B54A73 /* AppCenter-Config.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1668,7 +1720,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = JuicePlus/JuicePlus.entitlements;
-				CURRENT_PROJECT_VERSION = 68;
+				CURRENT_PROJECT_VERSION = 78;
 				DEVELOPMENT_TEAM = TK7T9A6RQ2;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = JuicePlus/Info.plist;
@@ -1677,7 +1729,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.0;
+				MARKETING_VERSION = 2.2.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1699,7 +1751,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = JuicePlus/JuicePlus.entitlements;
-				CURRENT_PROJECT_VERSION = 68;
+				CURRENT_PROJECT_VERSION = 78;
 				DEVELOPMENT_TEAM = TK7T9A6RQ2;
 				INFOPLIST_FILE = JuicePlus/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
@@ -1707,7 +1759,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.0;
+				MARKETING_VERSION = 2.2.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

Strides-APP/ios/JuicePlus/LaunchScreen.storyboard

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
-    <device id="retina6_0" orientation="portrait" appearance="light"/>
+    <device id="retina6_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
@@ -17,12 +17,12 @@
                         <viewControllerLayoutGuide type="bottom" id="3iD-Sd-rkK"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
-                        <rect key="frame" x="0.0" y="0.0" width="390" height="844"/>
+                        <rect key="frame" x="0.0" y="0.0" width="428" height="926"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="tool-logo" translatesAutoresizingMaskIntoConstraints="NO" id="Dka-En-aXR">
-                                <rect key="frame" x="114" y="238" width="174" height="74"/>
-                                <autoresizingMask key="autoresizingMask"/>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" preservesSuperviewLayoutMargins="YES" layoutMarginsFollowReadableWidth="YES" image="tool-logo" id="Dka-En-aXR">
+                                <rect key="frame" x="134" y="263" width="174" height="74"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                             </imageView>
                         </subviews>
                         <color key="backgroundColor" systemColor="tertiarySystemBackgroundColor"/>