Merge branch 'master' of https://gitea.23544.com/marking/WGShare.Mobile.Flutter

# Conflicts:
#	wgshare/pubspec.lock

wgshare/.gitignore

@@ -5,9 +5,11 @@
 *.swp
 .DS_Store
 .atom/
+.build/
 .buildlog/
 .history
 .svn/
+.swiftpm/
 migrate_working_dir/
 .fvm/
 

wgshare/ios/Runner/AppDelegate.swift

@@ -7,6 +7,7 @@ import UIKit
     _ application: UIApplication,
     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
   ) -> Bool {
+    Thread.sleep(forTimeInterval: 3) // 加入此行代码，便可延迟2秒关闭启动页
     GeneratedPluginRegistrant.register(with: self)
     return super.application(application, didFinishLaunchingWithOptions: launchOptions)
   }

wgshare/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -2,115 +2,153 @@
     "images": [
         {
             "size": "20x20",
-            "idiom": "universal",
+            "idiom": "iphone",
             "filename": "icon-20@2x.png",
-            "scale": "2x",
+            "scale": "2x"
-            "platform": "ios"
         },
         {
             "size": "20x20",
-            "idiom": "universal",
+            "idiom": "iphone",
             "filename": "icon-20@3x.png",
-            "scale": "3x",
+            "scale": "3x"
-            "platform": "ios"
         },
         {
             "size": "29x29",
-            "idiom": "universal",
+            "idiom": "iphone",
+            "filename": "icon-29.png",
+            "scale": "1x"
+        },
+        {
+            "size": "29x29",
+            "idiom": "iphone",
             "filename": "icon-29@2x.png",
-            "scale": "2x",
+            "scale": "2x"
-            "platform": "ios"
         },
         {
             "size": "29x29",
-            "idiom": "universal",
+            "idiom": "iphone",
             "filename": "icon-29@3x.png",
-            "scale": "3x",
+            "scale": "3x"
-            "platform": "ios"
-        },
-        {
-            "size": "38x38",
-            "idiom": "universal",
-            "filename": "icon-38@2x.png",
-            "scale": "2x",
-            "platform": "ios"
-        },
-        {
-            "size": "38x38",
-            "idiom": "universal",
-            "filename": "icon-38@3x.png",
-            "scale": "3x",
-            "platform": "ios"
         },
         {
             "size": "40x40",
-            "idiom": "universal",
+            "idiom": "iphone",
             "filename": "icon-40@2x.png",
-            "scale": "2x",
+            "scale": "2x"
-            "platform": "ios"
         },
         {
             "size": "40x40",
-            "idiom": "universal",
+            "idiom": "iphone",
             "filename": "icon-40@3x.png",
-            "scale": "3x",
+            "scale": "3x"
-            "platform": "ios"
+        },
+        {
+            "size": "57x57",
+            "idiom": "iphone",
+            "filename": "icon-57.png",
+            "scale": "1x"
+        },
+        {
+            "size": "57x57",
+            "idiom": "iphone",
+            "filename": "icon-57@2x.png",
+            "scale": "2x"
         },
         {
             "size": "60x60",
-            "idiom": "universal",
+            "idiom": "iphone",
             "filename": "icon-60@2x.png",
-            "scale": "2x",
+            "scale": "2x"
-            "platform": "ios"
         },
         {
             "size": "60x60",
-            "idiom": "universal",
+            "idiom": "iphone",
             "filename": "icon-60@3x.png",
-            "scale": "3x",
+            "scale": "3x"
-            "platform": "ios"
         },
         {
-            "size": "64x64",
+            "size": "20x20",
-            "idiom": "universal",
+            "idiom": "ipad",
-            "filename": "icon-64@2x.png",
+            "filename": "icon-20-ipad.png",
-            "scale": "2x",
+            "scale": "1x"
-            "platform": "ios"
         },
         {
-            "size": "64x64",
+            "size": "20x20",
-            "idiom": "universal",
+            "idiom": "ipad",
-            "filename": "icon-64@3x.png",
+            "filename": "icon-20@2x-ipad.png",
-            "scale": "3x",
+            "scale": "2x"
-            "platform": "ios"
         },
         {
-            "size": "68x68",
+            "size": "29x29",
-            "idiom": "universal",
+            "idiom": "ipad",
-            "filename": "icon-68@2x.png",
+            "filename": "icon-29-ipad.png",
-            "scale": "2x",
+            "scale": "1x"
-            "platform": "ios"
+        },
+        {
+            "size": "29x29",
+            "idiom": "ipad",
+            "filename": "icon-29@2x-ipad.png",
+            "scale": "2x"
+        },
+        {
+            "size": "40x40",
+            "idiom": "ipad",
+            "filename": "icon-40.png",
+            "scale": "1x"
+        },
+        {
+            "size": "40x40",
+            "idiom": "ipad",
+            "filename": "icon-40@2x.png",
+            "scale": "2x"
+        },
+        {
+            "size": "50x50",
+            "idiom": "ipad",
+            "filename": "icon-50.png",
+            "scale": "1x"
+        },
+        {
+            "size": "50x50",
+            "idiom": "ipad",
+            "filename": "icon-50@2x.png",
+            "scale": "2x"
+        },
+        {
+            "size": "72x72",
+            "idiom": "ipad",
+            "filename": "icon-72.png",
+            "scale": "1x"
+        },
+        {
+            "size": "72x72",
+            "idiom": "ipad",
+            "filename": "icon-72@2x.png",
+            "scale": "2x"
         },
         {
             "size": "76x76",
-            "idiom": "universal",
+            "idiom": "ipad",
+            "filename": "icon-76.png",
+            "scale": "1x"
+        },
+        {
+            "size": "76x76",
+            "idiom": "ipad",
             "filename": "icon-76@2x.png",
-            "scale": "2x",
+            "scale": "2x"
-            "platform": "ios"
         },
         {
             "size": "83.5x83.5",
-            "idiom": "universal",
+            "idiom": "ipad",
             "filename": "icon-83.5@2x.png",
-            "scale": "2x",
+            "scale": "2x"
-            "platform": "ios"
         },
         {
             "size": "1024x1024",
-            "idiom": "universal",
+            "idiom": "ios-marketing",
             "filename": "icon-1024.png",
-            "scale": "1x",
+            "scale": "1x"
-            "platform": "ios"
         }
     ],
     "info": {

wgshare/ios/Runner/Base.lproj/LaunchScreen.storyboard

@@ -1,8 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
@@ -14,9 +16,11 @@
                         <viewControllerLayoutGuide type="bottom" id="xbc-2k-c8Z"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4">
+                            <imageView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" misplaced="YES" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4">
+                                <rect key="frame" x="2" y="93" width="375" height="759"/>
                             </imageView>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -28,10 +32,10 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="53" y="375"/>
+            <point key="canvasLocation" x="121.37404580152672" y="185.91549295774649"/>
         </scene>
     </scenes>
     <resources>
-        <image name="LaunchImage" width="168" height="185"/>
+        <image name="LaunchImage" width="375" height="667"/>
     </resources>
 </document>

wgshare/ios/Runner/Base.lproj/Main.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
     <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -18,12 +18,21 @@
                     <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
                         <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="0Yj-sA-xJG">
+                                <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            </imageView>
+                        </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="9" y="-76"/>
+            <point key="canvasLocation" x="8.3969465648854964" y="-76.056338028169023"/>
         </scene>
     </scenes>
+    <resources>
+        <image name="LaunchImage" width="375" height="667"/>
+    </resources>
 </document>

wgshare/ios/Runner/Info.plist

@@ -33,7 +33,7 @@
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>
-	<string></string>
+	<string>Main.storyboard</string>
 	<key>UIMainStoryboardFile</key>
 	<string>Main</string>
 	<key>UIRequiresFullScreen</key>