...

diff --git a/learn/AcePlay/AcePlay.playground/playground.xcworkspace/xcuserdata/Ace.xcuserdatad/UserInterfaceState.xcuserstate b/learn/AcePlay/AcePlay.playground/playground.xcworkspace/xcuserdata/Ace.xcuserdatad/UserInterfaceState.xcuserstate
index b35f29100ff6b97f21fea7f96da6e7089607c721..8cf4b1077d959cea4094eb1a042120e3795ae4cf 100644 (file)
Binary files a/learn/AcePlay/AcePlay.playground/playground.xcworkspace/xcuserdata/Ace.xcuserdatad/UserInterfaceState.xcuserstate and b/learn/AcePlay/AcePlay.playground/playground.xcworkspace/xcuserdata/Ace.xcuserdatad/UserInterfaceState.xcuserstate differ

diff --git a/learn/AppleSwift/AppleSwift.xcodeproj/project.xcworkspace/xcuserdata/Ace.xcuserdatad/UserInterfaceState.xcuserstate b/learn/AppleSwift/AppleSwift.xcodeproj/project.xcworkspace/xcuserdata/Ace.xcuserdatad/UserInterfaceState.xcuserstate
index f58186fe55e17e8c3295ed30e447d57f34d8132b..5ac116a766f4b105a30e505cd35ec6e0af0d5812 100644 (file)
Binary files a/learn/AppleSwift/AppleSwift.xcodeproj/project.xcworkspace/xcuserdata/Ace.xcuserdatad/UserInterfaceState.xcuserstate and b/learn/AppleSwift/AppleSwift.xcodeproj/project.xcworkspace/xcuserdata/Ace.xcuserdatad/UserInterfaceState.xcuserstate differ

diff --git a/learn/AppleSwift/AppleSwift.xcodeproj/xcuserdata/Ace.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/learn/AppleSwift/AppleSwift.xcodeproj/xcuserdata/Ace.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index 7a7ffc6450abaf1e9afa77e1448b997bbd6edbec..58e10531f50e6ad3f45120d3028a1cea10972afc 100644 (file)
--- a/learn/AppleSwift/AppleSwift.xcodeproj/xcuserdata/Ace.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/learn/AppleSwift/AppleSwift.xcodeproj/xcuserdata/Ace.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -14,7 +14,9 @@
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "40"
-            endingLineNumber = "40">
+            endingLineNumber = "40"
+            landmarkName = "unknown"
+            landmarkType = "0">
          </BreakpointContent>
       </BreakpointProxy>
    </Breakpoints>

diff --git a/learn/go/clock.go b/learn/go/clock.go
index c7ce67aac44d792c22599e793088764286b8cd65..015b132d33a03a7c86c3bd4f3bf0546280e8512d 100644 (file)
--- a/learn/go/clock.go
+++ b/learn/go/clock.go
@@ -15,6 +15,8 @@ import (
     "net"
     "log"
     "time"
+    "math/rand"
+    "strconv"
 )
 
 func main() {
@@ -46,7 +48,12 @@ func handleConn(c net.Conn) {
             return
         }
 
-        //time.Sleep(1 * time.Second)
+        _, err = io.WriteString(c, strconv.Itoa(rand.Int())+"\n")
+        if err != nil {
+            return
+        }
+
+        time.Sleep(1 * time.Second)
         time.Sleep(100 * time.Millisecond);
     }
 }

diff --git a/tools/AceBox/AceBox.xcodeproj/project.pbxproj b/tools/AceBox/AceBox.xcodeproj/project.pbxproj
index e373c87b28f459c3dbf7798c6cb5e26ce593a448..617ae793b5370805194e6e546a9099315b1aab43 100644 (file)
--- a/tools/AceBox/AceBox.xcodeproj/project.pbxproj
+++ b/tools/AceBox/AceBox.xcodeproj/project.pbxproj
@@ -13,19 +13,8 @@
                50A4F2821AF2154100DB7E36 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50A4F2801AF2154100DB7E36 /* Main.storyboard */; };
                50A4F2841AF2154100DB7E36 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 50A4F2831AF2154100DB7E36 /* Images.xcassets */; };
                50A4F2871AF2154100DB7E36 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 50A4F2851AF2154100DB7E36 /* LaunchScreen.xib */; };
-               50A4F2931AF2154100DB7E36 /* AceBoxTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50A4F2921AF2154100DB7E36 /* AceBoxTests.swift */; };
 /* End PBXBuildFile section */
 
-/* Begin PBXContainerItemProxy section */
-               50A4F28D1AF2154100DB7E36 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 50A4F26D1AF2154100DB7E36 /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 50A4F2741AF2154100DB7E36;
-                       remoteInfo = AceBox;
-               };
-/* End PBXContainerItemProxy section */
-
 /* Begin PBXFileReference section */
                50A4F2751AF2154100DB7E36 /* Ace.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Ace.app; sourceTree = BUILT_PRODUCTS_DIR; };
                50A4F2791AF2154100DB7E36 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -35,7 +24,6 @@
                50A4F2811AF2154100DB7E36 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
                50A4F2831AF2154100DB7E36 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
                50A4F2861AF2154100DB7E36 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
-               50A4F28C1AF2154100DB7E36 /* AceBoxTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AceBoxTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
                50A4F2911AF2154100DB7E36 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
                50A4F2921AF2154100DB7E36 /* AceBoxTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AceBoxTests.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -48,13 +36,6 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
-               50A4F2891AF2154100DB7E36 /* Frameworks */ = {
-                       isa = PBXFrameworksBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
@@ -71,7 +52,6 @@
                        isa = PBXGroup;
                        children = (
                                50A4F2751AF2154100DB7E36 /* Ace.app */,
-                               50A4F28C1AF2154100DB7E36 /* AceBoxTests.xctest */,
                        );
                        name = Products;
                        sourceTree = "<group>";
@@ -135,24 +115,6 @@
                        productReference = 50A4F2751AF2154100DB7E36 /* Ace.app */;
                        productType = "com.apple.product-type.application";
                };
-               50A4F28B1AF2154100DB7E36 /* AceBoxTests */ = {
-                       isa = PBXNativeTarget;
-                       buildConfigurationList = 50A4F2991AF2154100DB7E36 /* Build configuration list for PBXNativeTarget "AceBoxTests" */;
-                       buildPhases = (
-                               50A4F2881AF2154100DB7E36 /* Sources */,
-                               50A4F2891AF2154100DB7E36 /* Frameworks */,
-                               50A4F28A1AF2154100DB7E36 /* Resources */,
-                       );
-                       buildRules = (
-                       );
-                       dependencies = (
-                               50A4F28E1AF2154100DB7E36 /* PBXTargetDependency */,
-                       );
-                       name = AceBoxTests;
-                       productName = AceBoxTests;
-                       productReference = 50A4F28C1AF2154100DB7E36 /* AceBoxTests.xctest */;
-                       productType = "com.apple.product-type.bundle.unit-test";
-               };
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
@@ -165,10 +127,7 @@
                                TargetAttributes = {
                                        50A4F2741AF2154100DB7E36 = {
                                                CreatedOnToolsVersion = 6.3.1;
-                                       };
-                                       50A4F28B1AF2154100DB7E36 = {
-                                               CreatedOnToolsVersion = 6.3.1;
-                                               TestTargetID = 50A4F2741AF2154100DB7E36;
+                                               DevelopmentTeam = VR7L9Q5L2E;
                                        };
                                };
                        };
@@ -186,7 +145,6 @@
                        projectRoot = "";
                        targets = (
                                50A4F2741AF2154100DB7E36 /* AceBox */,
-                               50A4F28B1AF2154100DB7E36 /* AceBoxTests */,
                        );
                };
 /* End PBXProject section */
@@ -202,13 +160,6 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
-               50A4F28A1AF2154100DB7E36 /* Resources */ = {
-                       isa = PBXResourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -222,24 +173,8 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
-               50A4F2881AF2154100DB7E36 /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               50A4F2931AF2154100DB7E36 /* AceBoxTests.swift in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
 /* End PBXSourcesBuildPhase section */
 
-/* Begin PBXTargetDependency section */
-               50A4F28E1AF2154100DB7E36 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 50A4F2741AF2154100DB7E36 /* AceBox */;
-                       targetProxy = 50A4F28D1AF2154100DB7E36 /* PBXContainerItemProxy */;
-               };
-/* End PBXTargetDependency section */
-
 /* Begin PBXVariantGroup section */
                50A4F2801AF2154100DB7E36 /* Main.storyboard */ = {
                        isa = PBXVariantGroup;
@@ -302,6 +237,7 @@
                                ONLY_ACTIVE_ARCH = YES;
                                SDKROOT = iphoneos;
                                SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+                               SWIFT_VERSION = 4.0;
                                TARGETED_DEVICE_FAMILY = "1,2";
                        };
                        name = Debug;
@@ -339,6 +275,7 @@
                                IPHONEOS_DEPLOYMENT_TARGET = 8.3;
                                MTL_ENABLE_DEBUG_INFO = NO;
                                SDKROOT = iphoneos;
+                               SWIFT_VERSION = 4.0;
                                TARGETED_DEVICE_FAMILY = "1,2";
                                VALIDATE_PRODUCT = YES;
                        };
@@ -348,10 +285,11 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+                               DEVELOPMENT_TEAM = VR7L9Q5L2E;
                                INFOPLIST_FILE = AceBox/Info.plist;
                                IPHONEOS_DEPLOYMENT_TARGET = 8.2;
                                LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-                               PRODUCT_BUNDLE_IDENTIFIER = "com.tencent.$(PRODUCT_NAME:rfc1034identifier)";
+                               PRODUCT_BUNDLE_IDENTIFIER = com.tencent.voip.ace;
                                PRODUCT_NAME = Ace;
                        };
                        name = Debug;
@@ -360,50 +298,15 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+                               DEVELOPMENT_TEAM = VR7L9Q5L2E;
                                INFOPLIST_FILE = AceBox/Info.plist;
                                IPHONEOS_DEPLOYMENT_TARGET = 8.2;
                                LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-                               PRODUCT_BUNDLE_IDENTIFIER = "com.tencent.$(PRODUCT_NAME:rfc1034identifier)";
+                               PRODUCT_BUNDLE_IDENTIFIER = com.tencent.voip.ace;
                                PRODUCT_NAME = Ace;
                        };
                        name = Release;
                };
-               50A4F29A1AF2154100DB7E36 /* Debug */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               BUNDLE_LOADER = "$(TEST_HOST)";
-                               FRAMEWORK_SEARCH_PATHS = (
-                                       "$(SDKROOT)/Developer/Library/Frameworks",
-                                       "$(inherited)",
-                               );
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       "DEBUG=1",
-                                       "$(inherited)",
-                               );
-                               INFOPLIST_FILE = AceBoxTests/Info.plist;
-                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-                               PRODUCT_BUNDLE_IDENTIFIER = "com.tencent.$(PRODUCT_NAME:rfc1034identifier)";
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                               TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AceBox.app/AceBox";
-                       };
-                       name = Debug;
-               };
-               50A4F29B1AF2154100DB7E36 /* Release */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               BUNDLE_LOADER = "$(TEST_HOST)";
-                               FRAMEWORK_SEARCH_PATHS = (
-                                       "$(SDKROOT)/Developer/Library/Frameworks",
-                                       "$(inherited)",
-                               );
-                               INFOPLIST_FILE = AceBoxTests/Info.plist;
-                               LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-                               PRODUCT_BUNDLE_IDENTIFIER = "com.tencent.$(PRODUCT_NAME:rfc1034identifier)";
-                               PRODUCT_NAME = "$(TARGET_NAME)";
-                               TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AceBox.app/AceBox";
-                       };
-                       name = Release;
-               };
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
@@ -425,15 +328,6 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
-               50A4F2991AF2154100DB7E36 /* Build configuration list for PBXNativeTarget "AceBoxTests" */ = {
-                       isa = XCConfigurationList;
-                       buildConfigurations = (
-                               50A4F29A1AF2154100DB7E36 /* Debug */,
-                               50A4F29B1AF2154100DB7E36 /* Release */,
-                       );
-                       defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Release;
-               };
 /* End XCConfigurationList section */
        };
        rootObject = 50A4F26D1AF2154100DB7E36 /* Project object */;

diff --git a/tools/AceBox/AceBox.xcodeproj/project.xcworkspace/xcuserdata/Ace.xcuserdatad/UserInterfaceState.xcuserstate b/tools/AceBox/AceBox.xcodeproj/project.xcworkspace/xcuserdata/Ace.xcuserdatad/UserInterfaceState.xcuserstate
index e0be8c76dbe4db0e7a147cfd23605df39d1a4971..edc0110c060f8efbf370b3abd9159bf40d9d7d34 100644 (file)
Binary files a/tools/AceBox/AceBox.xcodeproj/project.xcworkspace/xcuserdata/Ace.xcuserdatad/UserInterfaceState.xcuserstate and b/tools/AceBox/AceBox.xcodeproj/project.xcworkspace/xcuserdata/Ace.xcuserdatad/UserInterfaceState.xcuserstate differ

diff --git a/tools/AceBox/AceBox/Base.lproj/Main.storyboard b/tools/AceBox/AceBox/Base.lproj/Main.storyboard
index b4035b04db9c9e9dafd86403a53aa98ccc11f4fc..cc3204583bd1e2e357d7c590534071d7e7bfe49d 100644 (file)
--- a/tools/AceBox/AceBox/Base.lproj/Main.storyboard
+++ b/tools/AceBox/AceBox/Base.lproj/Main.storyboard
@@ -1,9 +1,18 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="49e-Tb-3d3">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="49e-Tb-3d3">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment version="2336" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13174"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="Helvetica.ttc">
+            <string>Helvetica</string>
+        </array>
+    </customFonts>
     <scenes>
         <!--Ace-->
         <scene sceneID="hNz-n2-bh7">
@@ -14,24 +23,24 @@
                         <viewControllerLayoutGuide type="bottom" id="4ug-Mw-9AY"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="tsR-hK-woN">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" misplaced="YES" text="赵彦柏" textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="KQZ-1w-vlD">
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" misplaced="YES" text="AceVest" textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="KQZ-1w-vlD">
                                 <rect key="frame" x="221" y="278" width="158" height="42"/>
-                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                 <fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="36"/>
-                                <color key="textColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
-                                <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <color key="textColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </label>
                             <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Loaded by FirstViewController" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="A5M-7J-77L">
                                 <rect key="frame" x="203" y="327" width="195" height="17"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                <color key="textColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
-                                <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <color key="textColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </label>
                         </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstAttribute="centerX" secondItem="KQZ-1w-vlD" secondAttribute="centerX" id="6BV-lF-sBN"/>
                             <constraint firstItem="A5M-7J-77L" firstAttribute="top" secondItem="KQZ-1w-vlD" secondAttribute="bottom" constant="8" symbolic="YES" id="cfb-er-3JN"/>
@@ -54,24 +63,24 @@
                         <viewControllerLayoutGuide type="bottom" id="Djb-ko-YwX"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="QS5-Rx-YEW">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" misplaced="YES" text="Second View" textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="zEq-FU-wV5">
                                 <rect key="frame" x="195" y="278" width="209.5" height="41.5"/>
-                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                 <fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="36"/>
-                                <color key="textColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
-                                <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <color key="textColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </label>
                             <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Loaded by SecondViewController" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NDk-cv-Gan">
                                 <rect key="frame" x="192" y="327" width="215" height="17"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                <color key="textColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
+                                <color key="textColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                         </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="NDk-cv-Gan" firstAttribute="top" secondItem="zEq-FU-wV5" secondAttribute="bottom" constant="8" symbolic="YES" id="Day-4N-Vmt"/>
                             <constraint firstItem="NDk-cv-Gan" firstAttribute="centerX" secondItem="zEq-FU-wV5" secondAttribute="centerX" id="JgO-Fn-dHn"/>
@@ -94,12 +103,12 @@
                         <viewControllerLayoutGuide type="bottom" id="QNW-MS-DZf"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="Blk-xb-rOq">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Raa-Jl-0dF" userLabel="TextContainer">
+                            <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Raa-Jl-0dF" userLabel="TextContainer">
                                 <rect key="frame" x="150" y="300" width="300" height="180"/>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </view>
                             <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="HeadImg" translatesAutoresizingMaskIntoConstraints="NO" id="R4n-8M-7o5">
                                 <rect key="frame" x="180" y="83" width="240" height="128"/>
@@ -109,7 +118,7 @@
                                 </constraints>
                             </imageView>
                         </subviews>
-                        <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                        <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="Raa-Jl-0dF" firstAttribute="top" secondItem="R4n-8M-7o5" secondAttribute="bottom" constant="10" id="Lgh-nr-xyJ"/>
                             <constraint firstItem="R4n-8M-7o5" firstAttribute="top" secondItem="DLs-VT-Hhw" secondAttribute="bottom" constant="42" id="N3x-BZ-WaD"/>
@@ -130,12 +139,12 @@
                     <tabBar key="tabBar" contentMode="scaleToFill" id="W28-zg-YXA">
                         <rect key="frame" x="0.0" y="975" width="768" height="49"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
-                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                        <color key="barTintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                        <color key="selectedImageTintColor" red="0.97553044557571411" green="0.16361516714096069" blue="0.033996976912021637" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="barTintColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="selectedImageTintColor" red="0.95593273639678955" green="0.053319774568080902" blue="0.048136062920093536" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <userDefinedRuntimeAttributes>
                             <userDefinedRuntimeAttribute type="color" keyPath="selectedImageTintColor">
-                                <color key="value" red="0.0" green="1" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                <color key="value" red="0.0" green="1" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </userDefinedRuntimeAttribute>
                         </userDefinedRuntimeAttributes>
                     </tabBar>
@@ -156,5 +165,5 @@
         <image name="HeadImg" width="1159" height="1160"/>
         <image name="MsgBubbleHL" width="25" height="23"/>
     </resources>
-    <color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+    <color key="tintColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
 </document>

diff --git a/tools/AceBox/AceBox/Images.xcassets/AppIcon.appiconset/Contents.json b/tools/AceBox/AceBox/Images.xcassets/AppIcon.appiconset/Contents.json
index 0052e14c9392bfa988149d74ba997de162fc07a4..d80ff66b80f8a3ae0cf5842b65b62a85c4fd37fb 100644 (file)
--- a/tools/AceBox/AceBox/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/tools/AceBox/AceBox/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -1,5 +1,15 @@
 {
   "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
     {
       "idiom" : "iphone",
       "size" : "29x29",
@@ -32,6 +42,16 @@
       "filename" : "AceBoxIcon@3x.png",
       "scale" : "3x"
     },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
     {
       "idiom" : "ipad",
       "size" : "29x29",
@@ -68,6 +88,11 @@
       "idiom" : "ipad",
       "size" : "83.5x83.5",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
     }
   ],
   "info" : {

diff --git a/tools/AceBox/AceBoxTests/AceBoxTests.swift b/tools/AceBox/AceBoxTests/AceBoxTests.swift
index 058e11456a3230065e6286f59cc06c36c410a283..60c100817704718b6f0e75bdd78de2ab3d1a4402 100644 (file)
--- a/tools/AceBox/AceBoxTests/AceBoxTests.swift
+++ b/tools/AceBox/AceBoxTests/AceBoxTests.swift
@@ -28,7 +28,7 @@ class AceBoxTests: XCTestCase {
     
     func testPerformanceExample() {
         // This is an example of a performance test case.
-        self.measureBlock() {
+        self.measure() {
             // Put the code you want to measure the time of here.
         }
     }

diff --git a/tools/game/ksp_planet_transfer_calculator.go b/tools/game/ksp_planet_transfer_calculator.go
index dbc3ebb64101e0a23907f645fb8677f46b6530ef..a65cc0b5b617900ffcb3eb2b672ce5d85f00c475 100644 (file)
--- a/tools/game/ksp_planet_transfer_calculator.go
+++ b/tools/game/ksp_planet_transfer_calculator.go
@@ -19,7 +19,7 @@ type AstronomicalObject struct {
        sma                             float64 // Semi-major axis 轨道半长轴
        inclination             float64 // 轨道倾角
        eccentricity    float64 // 轨道偏心率,没有使用
-       u                               float64 // 标准重力参数
+       u                               float64 // 标准重力参数 u = GM, F=(G*M*m)/(r^2)
        soi                             float64 // Sphere of influence 势国作用范围
 }
 
@@ -34,6 +34,17 @@ var objects = map[string]AstronomicalObject {
                1.1723328e18,
                math.MaxFloat64,        // 应该是infinity
        },
+    "Eve" :
+    {
+        "Eve",
+        "Kerbol",
+        700000,
+        9832684544,
+        2.1,
+        0.01,
+        8.1717302E12,
+        85109365,
+    },
        "Duna" :
        {
                "Duna",
@@ -68,7 +79,7 @@ func main() {
 
        // 轨道周期的计算公式为 T=2*Pi*sqrt(sma^3/u)
        // 设源和目标轨道半轴长分别为Rs, Rd
-       // 则转移轨道周期为 Tt = 2*Pi*sqlrt(((Rs+Rd)/2)^3/u)
+       // 则转移轨道周期为 Tt = 2*Pi*sqrt(((Rs+Rd)/2)^3/u)
        // 则源，目标和平均转移角速度分别为 Ws = 1/Ts, Wd = 1/Td, Wt = 1/Tt
        // 设转移时间为t
        // 则有 t*Wt = Pi   ===> t = Tt*Pi
@@ -77,7 +88,7 @@ func main() {
        // ===> PhaseAngle = Pi - Tt*Pi/Td 
 
        aos := objects["Kerbin"]
-       aod := objects["Duna"]
+       aod := objects["Eve"]
        if aos.parent != aod.parent || aos.parent == "" || aod.parent == "" {
                fmt.Println("invalid astronomical object");
                return