liuzhenxing1118 7 months ago
parent
commit
d0898b3593

+ 171 - 134
artimenring-iOS/Artimenring/Base.lproj/Main.storyboard

@@ -125,6 +125,172 @@
                                     <constraint firstAttribute="width" constant="70" id="eWF-nb-Wxp"/>
                                 </constraints>
                             </stackView>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2IB-7x-xqq">
+                                <rect key="frame" x="0.0" y="140" width="375" height="70"/>
+                                <subviews>
+                                    <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TwU-JV-uBA">
+                                        <rect key="frame" x="15" y="10" width="80" height="44"/>
+                                        <subviews>
+                                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vrm-JM-csp">
+                                                <rect key="frame" x="0.0" y="0.0" width="70" height="44"/>
+                                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                            </button>
+                                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="weather_bg" translatesAutoresizingMaskIntoConstraints="NO" id="W8Q-dc-H9X">
+                                                <rect key="frame" x="0.0" y="0.0" width="80" height="24"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="24" id="Amz-dH-3pD"/>
+                                                </constraints>
+                                            </imageView>
+                                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="weather_state_10" translatesAutoresizingMaskIntoConstraints="NO" id="RUs-hH-k8w">
+                                                <rect key="frame" x="10" y="3" width="18" height="18"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="18" id="BOc-kY-QgE"/>
+                                                    <constraint firstAttribute="width" constant="18" id="fNW-Ad-KSa"/>
+                                                </constraints>
+                                            </imageView>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="33°" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SUr-1E-nHH">
+                                                <rect key="frame" x="40.666666666666664" y="0.0" width="29.333333333333336" height="24"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="24" id="dCw-7N-MRb"/>
+                                                </constraints>
+                                                <fontDescription key="fontDescription" type="system" weight="light" pointSize="18"/>
+                                                <color key="textColor" red="0.0" green="0.0039215686274509803" blue="0.29411764705882354" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                <nil key="highlightedColor"/>
+                                            </label>
+                                            <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="weather_aqi_1" translatesAutoresizingMaskIntoConstraints="NO" id="bDX-az-iGR">
+                                                <rect key="frame" x="0.0" y="27" width="70" height="17"/>
+                                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                            </imageView>
+                                            <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="空气质量指数" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZFe-P8-qjj">
+                                                <rect key="frame" x="0.0" y="27" width="70" height="17"/>
+                                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="8"/>
+                                                <color key="textColor" red="0.0" green="0.0039215686274509803" blue="0.29411764705882354" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                <nil key="highlightedColor"/>
+                                            </label>
+                                        </subviews>
+                                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <constraints>
+                                            <constraint firstItem="RUs-hH-k8w" firstAttribute="leading" secondItem="TwU-JV-uBA" secondAttribute="leading" constant="10" id="2y5-6x-5WK"/>
+                                            <constraint firstAttribute="trailing" secondItem="W8Q-dc-H9X" secondAttribute="trailing" id="3iG-UZ-qi5"/>
+                                            <constraint firstItem="W8Q-dc-H9X" firstAttribute="top" secondItem="TwU-JV-uBA" secondAttribute="top" id="4Ch-QW-VQ5"/>
+                                            <constraint firstAttribute="height" constant="44" id="9dl-Xd-V8D"/>
+                                            <constraint firstItem="RUs-hH-k8w" firstAttribute="centerY" secondItem="W8Q-dc-H9X" secondAttribute="centerY" id="PIC-kT-Zuo"/>
+                                            <constraint firstAttribute="width" constant="80" id="VN8-cA-Wta"/>
+                                            <constraint firstAttribute="trailing" secondItem="SUr-1E-nHH" secondAttribute="trailing" constant="10" id="hUX-Cz-XKa"/>
+                                            <constraint firstItem="W8Q-dc-H9X" firstAttribute="leading" secondItem="TwU-JV-uBA" secondAttribute="leading" id="pEu-Z5-Erg"/>
+                                            <constraint firstItem="SUr-1E-nHH" firstAttribute="centerY" secondItem="W8Q-dc-H9X" secondAttribute="centerY" id="sZp-4N-Nlz"/>
+                                        </constraints>
+                                    </view>
+                                    <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fdU-CV-3F4">
+                                        <rect key="frame" x="98" y="10" width="56" height="24"/>
+                                        <subviews>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dUW-8Q-ud7">
+                                                <rect key="frame" x="0.0" y="0.0" width="56" height="24"/>
+                                                <connections>
+                                                    <action selector="onWeatherChangeAction:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="Jyg-Ef-yiC"/>
+                                                </connections>
+                                            </button>
+                                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="weather_bg" translatesAutoresizingMaskIntoConstraints="NO" id="f0v-is-cxh">
+                                                <rect key="frame" x="0.0" y="0.0" width="56" height="24"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="24" id="YMW-2V-QPQ"/>
+                                                </constraints>
+                                            </imageView>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="°C" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UAF-MV-id5">
+                                                <rect key="frame" x="4.6666666666666714" y="0.0" width="16.333333333333332" height="24"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="24" id="0le-92-8rf"/>
+                                                </constraints>
+                                                <fontDescription key="fontDescription" type="system" weight="light" pointSize="14"/>
+                                                <color key="textColor" red="0.0" green="0.0039215686274509803" blue="0.0" alpha="0.40216023489932884" colorSpace="custom" customColorSpace="sRGB"/>
+                                                <nil key="highlightedColor"/>
+                                            </label>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="/" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XsX-Eh-wd5">
+                                                <rect key="frame" x="26" y="0.0" width="4" height="24"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="24" id="7B6-ax-Uig"/>
+                                                </constraints>
+                                                <fontDescription key="fontDescription" type="system" weight="light" pointSize="14"/>
+                                                <color key="textColor" red="0.0" green="0.0039215686274509803" blue="0.0" alpha="0.39846371644295303" colorSpace="custom" customColorSpace="sRGB"/>
+                                                <nil key="highlightedColor"/>
+                                            </label>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="°F" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fDb-Ef-cz9">
+                                                <rect key="frame" x="35" y="0.0" width="14.333333333333336" height="24"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="24" id="lNJ-h5-fE7"/>
+                                                </constraints>
+                                                <fontDescription key="fontDescription" type="system" weight="light" pointSize="14"/>
+                                                <color key="textColor" red="0.0" green="0.0039215686274509803" blue="0.0" alpha="0.40216023489932884" colorSpace="custom" customColorSpace="sRGB"/>
+                                                <nil key="highlightedColor"/>
+                                            </label>
+                                        </subviews>
+                                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <constraints>
+                                            <constraint firstItem="UAF-MV-id5" firstAttribute="centerY" secondItem="XsX-Eh-wd5" secondAttribute="centerY" id="7ra-Nm-XOU"/>
+                                            <constraint firstAttribute="trailing" secondItem="f0v-is-cxh" secondAttribute="trailing" id="8B3-sF-tWI"/>
+                                            <constraint firstAttribute="height" constant="24" id="8SA-Mh-6jy"/>
+                                            <constraint firstItem="fDb-Ef-cz9" firstAttribute="centerY" secondItem="XsX-Eh-wd5" secondAttribute="centerY" id="JEo-6v-Vs1"/>
+                                            <constraint firstItem="XsX-Eh-wd5" firstAttribute="centerX" secondItem="f0v-is-cxh" secondAttribute="centerX" id="Q9H-Im-G3o"/>
+                                            <constraint firstItem="XsX-Eh-wd5" firstAttribute="centerY" secondItem="f0v-is-cxh" secondAttribute="centerY" id="Tc0-gh-6iM"/>
+                                            <constraint firstItem="XsX-Eh-wd5" firstAttribute="leading" secondItem="UAF-MV-id5" secondAttribute="trailing" constant="5" id="cd9-Ym-cZ2"/>
+                                            <constraint firstAttribute="width" constant="56" id="lZX-kG-EZX"/>
+                                            <constraint firstItem="dUW-8Q-ud7" firstAttribute="top" secondItem="fdU-CV-3F4" secondAttribute="top" id="lat-cn-k46"/>
+                                            <constraint firstItem="f0v-is-cxh" firstAttribute="top" secondItem="fdU-CV-3F4" secondAttribute="top" id="llt-GN-l76"/>
+                                            <constraint firstAttribute="bottom" secondItem="dUW-8Q-ud7" secondAttribute="bottom" id="lnJ-Yo-wap"/>
+                                            <constraint firstAttribute="trailing" secondItem="dUW-8Q-ud7" secondAttribute="trailing" id="nO5-VB-9DD"/>
+                                            <constraint firstItem="fDb-Ef-cz9" firstAttribute="leading" secondItem="XsX-Eh-wd5" secondAttribute="trailing" constant="5" id="srw-Pw-tUQ"/>
+                                            <constraint firstItem="f0v-is-cxh" firstAttribute="leading" secondItem="fdU-CV-3F4" secondAttribute="leading" id="xxo-Qa-WhI"/>
+                                            <constraint firstItem="dUW-8Q-ud7" firstAttribute="leading" secondItem="fdU-CV-3F4" secondAttribute="leading" id="yv8-9Z-FmD"/>
+                                        </constraints>
+                                    </view>
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1c2-iI-VyM">
+                                        <rect key="frame" x="18" y="0.0" width="110" height="40"/>
+                                        <subviews>
+                                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="weather_state_10" translatesAutoresizingMaskIntoConstraints="NO" id="EBs-Wo-ifM">
+                                                <rect key="frame" x="15" y="8" width="24" height="24"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="24" id="LLV-Oe-z1V"/>
+                                                    <constraint firstAttribute="height" constant="24" id="bhU-zI-zxu"/>
+                                                </constraints>
+                                            </imageView>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="20°C" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="c3G-f0-VXg">
+                                                <rect key="frame" x="52.666666666666671" y="8" width="39.333333333333329" height="24"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="24" id="ons-VZ-BEj"/>
+                                                </constraints>
+                                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                <color key="textColor" red="0.0" green="0.0039215686269999999" blue="0.29411764709999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                <nil key="highlightedColor"/>
+                                            </label>
+                                        </subviews>
+                                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                        <constraints>
+                                            <constraint firstAttribute="width" constant="110" id="R4w-7J-997"/>
+                                            <constraint firstItem="EBs-Wo-ifM" firstAttribute="leading" secondItem="1c2-iI-VyM" secondAttribute="leading" constant="15" id="Slu-0Y-9hG"/>
+                                            <constraint firstAttribute="trailing" secondItem="c3G-f0-VXg" secondAttribute="trailing" constant="18" id="Yxd-Jc-NHk"/>
+                                            <constraint firstItem="c3G-f0-VXg" firstAttribute="centerY" secondItem="1c2-iI-VyM" secondAttribute="centerY" id="ZoH-DR-Wld"/>
+                                            <constraint firstAttribute="height" constant="40" id="aWr-5C-pQH"/>
+                                            <constraint firstItem="EBs-Wo-ifM" firstAttribute="centerY" secondItem="1c2-iI-VyM" secondAttribute="centerY" id="s2M-ye-g8i"/>
+                                        </constraints>
+                                        <userDefinedRuntimeAttributes>
+                                            <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                                <integer key="value" value="20"/>
+                                            </userDefinedRuntimeAttribute>
+                                        </userDefinedRuntimeAttributes>
+                                    </view>
+                                </subviews>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <constraints>
+                                    <constraint firstItem="1c2-iI-VyM" firstAttribute="leading" secondItem="2IB-7x-xqq" secondAttribute="leading" constant="18" id="3by-lq-bmR"/>
+                                    <constraint firstAttribute="height" constant="70" id="PJR-re-sKY"/>
+                                    <constraint firstItem="1c2-iI-VyM" firstAttribute="top" secondItem="2IB-7x-xqq" secondAttribute="top" id="SJg-09-nzi"/>
+                                    <constraint firstItem="TwU-JV-uBA" firstAttribute="top" secondItem="2IB-7x-xqq" secondAttribute="top" constant="10" id="Tjh-Y3-P4E"/>
+                                    <constraint firstItem="TwU-JV-uBA" firstAttribute="leading" secondItem="2IB-7x-xqq" secondAttribute="leading" constant="15" id="XxF-pX-FbM"/>
+                                    <constraint firstItem="fdU-CV-3F4" firstAttribute="leading" secondItem="TwU-JV-uBA" secondAttribute="trailing" constant="3" id="abZ-cW-6fO"/>
+                                    <constraint firstItem="fdU-CV-3F4" firstAttribute="top" secondItem="TwU-JV-uBA" secondAttribute="top" id="t9q-TD-zjv"/>
+                                </constraints>
+                            </view>
                             <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GF7-H3-tD1">
                                 <rect key="frame" x="10" y="587" width="132.66666666666666" height="34"/>
                                 <subviews>
@@ -174,134 +340,6 @@
                             <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SRW-Qp-2Ju">
                                 <rect key="frame" x="0.0" y="50" width="375" height="70"/>
                                 <subviews>
-                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2IB-7x-xqq">
-                                        <rect key="frame" x="0.0" y="0.0" width="375" height="70"/>
-                                        <subviews>
-                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TwU-JV-uBA">
-                                                <rect key="frame" x="15" y="10" width="80" height="44"/>
-                                                <subviews>
-                                                    <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vrm-JM-csp">
-                                                        <rect key="frame" x="0.0" y="0.0" width="70" height="44"/>
-                                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                    </button>
-                                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="weather_bg" translatesAutoresizingMaskIntoConstraints="NO" id="W8Q-dc-H9X">
-                                                        <rect key="frame" x="0.0" y="0.0" width="80" height="24"/>
-                                                        <constraints>
-                                                            <constraint firstAttribute="height" constant="24" id="Amz-dH-3pD"/>
-                                                        </constraints>
-                                                    </imageView>
-                                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="weather_state_10" translatesAutoresizingMaskIntoConstraints="NO" id="RUs-hH-k8w">
-                                                        <rect key="frame" x="10" y="3" width="18" height="18"/>
-                                                        <constraints>
-                                                            <constraint firstAttribute="height" constant="18" id="BOc-kY-QgE"/>
-                                                            <constraint firstAttribute="width" constant="18" id="fNW-Ad-KSa"/>
-                                                        </constraints>
-                                                    </imageView>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="33°" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SUr-1E-nHH">
-                                                        <rect key="frame" x="40.666666666666664" y="0.0" width="29.333333333333336" height="24"/>
-                                                        <constraints>
-                                                            <constraint firstAttribute="height" constant="24" id="dCw-7N-MRb"/>
-                                                        </constraints>
-                                                        <fontDescription key="fontDescription" type="system" weight="light" pointSize="18"/>
-                                                        <color key="textColor" red="0.0" green="0.0039215686274509803" blue="0.29411764705882354" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                        <nil key="highlightedColor"/>
-                                                    </label>
-                                                    <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="weather_aqi_1" translatesAutoresizingMaskIntoConstraints="NO" id="bDX-az-iGR">
-                                                        <rect key="frame" x="0.0" y="27" width="70" height="17"/>
-                                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                    </imageView>
-                                                    <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="空气质量指数" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZFe-P8-qjj">
-                                                        <rect key="frame" x="0.0" y="27" width="70" height="17"/>
-                                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                        <fontDescription key="fontDescription" type="system" pointSize="8"/>
-                                                        <color key="textColor" red="0.0" green="0.0039215686274509803" blue="0.29411764705882354" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                        <nil key="highlightedColor"/>
-                                                    </label>
-                                                </subviews>
-                                                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
-                                                <constraints>
-                                                    <constraint firstItem="RUs-hH-k8w" firstAttribute="leading" secondItem="TwU-JV-uBA" secondAttribute="leading" constant="10" id="2y5-6x-5WK"/>
-                                                    <constraint firstAttribute="trailing" secondItem="W8Q-dc-H9X" secondAttribute="trailing" id="3iG-UZ-qi5"/>
-                                                    <constraint firstItem="W8Q-dc-H9X" firstAttribute="top" secondItem="TwU-JV-uBA" secondAttribute="top" id="4Ch-QW-VQ5"/>
-                                                    <constraint firstAttribute="height" constant="44" id="9dl-Xd-V8D"/>
-                                                    <constraint firstItem="RUs-hH-k8w" firstAttribute="centerY" secondItem="W8Q-dc-H9X" secondAttribute="centerY" id="PIC-kT-Zuo"/>
-                                                    <constraint firstAttribute="width" constant="80" id="VN8-cA-Wta"/>
-                                                    <constraint firstAttribute="trailing" secondItem="SUr-1E-nHH" secondAttribute="trailing" constant="10" id="hUX-Cz-XKa"/>
-                                                    <constraint firstItem="W8Q-dc-H9X" firstAttribute="leading" secondItem="TwU-JV-uBA" secondAttribute="leading" id="pEu-Z5-Erg"/>
-                                                    <constraint firstItem="SUr-1E-nHH" firstAttribute="centerY" secondItem="W8Q-dc-H9X" secondAttribute="centerY" id="sZp-4N-Nlz"/>
-                                                </constraints>
-                                            </view>
-                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fdU-CV-3F4">
-                                                <rect key="frame" x="98" y="10" width="56" height="24"/>
-                                                <subviews>
-                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dUW-8Q-ud7">
-                                                        <rect key="frame" x="0.0" y="0.0" width="56" height="24"/>
-                                                        <connections>
-                                                            <action selector="onWeatherChangeAction:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="Jyg-Ef-yiC"/>
-                                                        </connections>
-                                                    </button>
-                                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="weather_bg" translatesAutoresizingMaskIntoConstraints="NO" id="f0v-is-cxh">
-                                                        <rect key="frame" x="0.0" y="0.0" width="56" height="24"/>
-                                                        <constraints>
-                                                            <constraint firstAttribute="height" constant="24" id="YMW-2V-QPQ"/>
-                                                        </constraints>
-                                                    </imageView>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="°C" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UAF-MV-id5">
-                                                        <rect key="frame" x="4.6666666666666714" y="0.0" width="16.333333333333332" height="24"/>
-                                                        <constraints>
-                                                            <constraint firstAttribute="height" constant="24" id="0le-92-8rf"/>
-                                                        </constraints>
-                                                        <fontDescription key="fontDescription" type="system" weight="light" pointSize="14"/>
-                                                        <color key="textColor" red="0.0" green="0.0039215686274509803" blue="0.0" alpha="0.40216023489932884" colorSpace="custom" customColorSpace="sRGB"/>
-                                                        <nil key="highlightedColor"/>
-                                                    </label>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="/" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XsX-Eh-wd5">
-                                                        <rect key="frame" x="26" y="0.0" width="4" height="24"/>
-                                                        <constraints>
-                                                            <constraint firstAttribute="height" constant="24" id="7B6-ax-Uig"/>
-                                                        </constraints>
-                                                        <fontDescription key="fontDescription" type="system" weight="light" pointSize="14"/>
-                                                        <color key="textColor" red="0.0" green="0.0039215686274509803" blue="0.0" alpha="0.39846371644295303" colorSpace="custom" customColorSpace="sRGB"/>
-                                                        <nil key="highlightedColor"/>
-                                                    </label>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="°F" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fDb-Ef-cz9">
-                                                        <rect key="frame" x="35" y="0.0" width="14.333333333333336" height="24"/>
-                                                        <constraints>
-                                                            <constraint firstAttribute="height" constant="24" id="lNJ-h5-fE7"/>
-                                                        </constraints>
-                                                        <fontDescription key="fontDescription" type="system" weight="light" pointSize="14"/>
-                                                        <color key="textColor" red="0.0" green="0.0039215686274509803" blue="0.0" alpha="0.40216023489932884" colorSpace="custom" customColorSpace="sRGB"/>
-                                                        <nil key="highlightedColor"/>
-                                                    </label>
-                                                </subviews>
-                                                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
-                                                <constraints>
-                                                    <constraint firstItem="UAF-MV-id5" firstAttribute="centerY" secondItem="XsX-Eh-wd5" secondAttribute="centerY" id="7ra-Nm-XOU"/>
-                                                    <constraint firstAttribute="trailing" secondItem="f0v-is-cxh" secondAttribute="trailing" id="8B3-sF-tWI"/>
-                                                    <constraint firstAttribute="height" constant="24" id="8SA-Mh-6jy"/>
-                                                    <constraint firstItem="fDb-Ef-cz9" firstAttribute="centerY" secondItem="XsX-Eh-wd5" secondAttribute="centerY" id="JEo-6v-Vs1"/>
-                                                    <constraint firstItem="XsX-Eh-wd5" firstAttribute="centerX" secondItem="f0v-is-cxh" secondAttribute="centerX" id="Q9H-Im-G3o"/>
-                                                    <constraint firstItem="XsX-Eh-wd5" firstAttribute="centerY" secondItem="f0v-is-cxh" secondAttribute="centerY" id="Tc0-gh-6iM"/>
-                                                    <constraint firstItem="XsX-Eh-wd5" firstAttribute="leading" secondItem="UAF-MV-id5" secondAttribute="trailing" constant="5" id="cd9-Ym-cZ2"/>
-                                                    <constraint firstAttribute="width" constant="56" id="lZX-kG-EZX"/>
-                                                    <constraint firstItem="dUW-8Q-ud7" firstAttribute="top" secondItem="fdU-CV-3F4" secondAttribute="top" id="lat-cn-k46"/>
-                                                    <constraint firstItem="f0v-is-cxh" firstAttribute="top" secondItem="fdU-CV-3F4" secondAttribute="top" id="llt-GN-l76"/>
-                                                    <constraint firstAttribute="bottom" secondItem="dUW-8Q-ud7" secondAttribute="bottom" id="lnJ-Yo-wap"/>
-                                                    <constraint firstAttribute="trailing" secondItem="dUW-8Q-ud7" secondAttribute="trailing" id="nO5-VB-9DD"/>
-                                                    <constraint firstItem="fDb-Ef-cz9" firstAttribute="leading" secondItem="XsX-Eh-wd5" secondAttribute="trailing" constant="5" id="srw-Pw-tUQ"/>
-                                                    <constraint firstItem="f0v-is-cxh" firstAttribute="leading" secondItem="fdU-CV-3F4" secondAttribute="leading" id="xxo-Qa-WhI"/>
-                                                    <constraint firstItem="dUW-8Q-ud7" firstAttribute="leading" secondItem="fdU-CV-3F4" secondAttribute="leading" id="yv8-9Z-FmD"/>
-                                                </constraints>
-                                            </view>
-                                        </subviews>
-                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                        <constraints>
-                                            <constraint firstItem="TwU-JV-uBA" firstAttribute="top" secondItem="2IB-7x-xqq" secondAttribute="top" constant="10" id="Tjh-Y3-P4E"/>
-                                            <constraint firstItem="TwU-JV-uBA" firstAttribute="leading" secondItem="2IB-7x-xqq" secondAttribute="leading" constant="15" id="XxF-pX-FbM"/>
-                                            <constraint firstItem="fdU-CV-3F4" firstAttribute="leading" secondItem="TwU-JV-uBA" secondAttribute="trailing" constant="3" id="abZ-cW-6fO"/>
-                                            <constraint firstItem="fdU-CV-3F4" firstAttribute="top" secondItem="TwU-JV-uBA" secondAttribute="top" id="t9q-TD-zjv"/>
-                                        </constraints>
-                                    </view>
                                     <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hOt-He-zb3">
                                         <rect key="frame" x="290" y="10" width="70" height="24"/>
                                         <subviews>
@@ -361,11 +399,7 @@
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="70" id="3P6-nJ-OH8"/>
-                                    <constraint firstAttribute="trailing" secondItem="2IB-7x-xqq" secondAttribute="trailing" id="Etn-l5-b10"/>
-                                    <constraint firstAttribute="bottom" secondItem="2IB-7x-xqq" secondAttribute="bottom" id="FM0-k8-00j"/>
                                     <constraint firstItem="hOt-He-zb3" firstAttribute="top" secondItem="SRW-Qp-2Ju" secondAttribute="top" constant="10" id="Qb1-18-49p"/>
-                                    <constraint firstItem="2IB-7x-xqq" firstAttribute="leading" secondItem="SRW-Qp-2Ju" secondAttribute="leading" id="a4g-Cd-N7h"/>
-                                    <constraint firstItem="2IB-7x-xqq" firstAttribute="top" secondItem="SRW-Qp-2Ju" secondAttribute="top" id="c7F-Zb-4OA"/>
                                     <constraint firstAttribute="trailing" secondItem="hOt-He-zb3" secondAttribute="trailing" constant="15" id="v2j-oL-I7X"/>
                                 </constraints>
                             </view>
@@ -470,6 +504,7 @@
                             <constraint firstItem="9oE-2Y-Zjp" firstAttribute="trailing" secondItem="3M5-Qw-9Er" secondAttribute="trailing" id="GgG-SA-cik"/>
                             <constraint firstItem="3M5-Qw-9Er" firstAttribute="top" secondItem="6cb-MZ-2sT" secondAttribute="bottom" constant="10" id="IXi-LU-oqH"/>
                             <constraint firstItem="9oE-2Y-Zjp" firstAttribute="trailing" secondItem="oGO-U0-ITi" secondAttribute="trailing" id="J3u-lt-DIF"/>
+                            <constraint firstItem="2IB-7x-xqq" firstAttribute="leading" secondItem="9oE-2Y-Zjp" secondAttribute="leading" id="K8L-hb-5HO"/>
                             <constraint firstItem="uLg-AT-jcT" firstAttribute="top" secondItem="9oE-2Y-Zjp" secondAttribute="top" id="LS2-KL-XoH"/>
                             <constraint firstItem="ltI-lH-4P6" firstAttribute="leading" secondItem="9oE-2Y-Zjp" secondAttribute="leading" id="OoU-9V-Xb7"/>
                             <constraint firstItem="9oE-2Y-Zjp" firstAttribute="top" secondItem="ltI-lH-4P6" secondAttribute="top" constant="60" id="PR1-A5-2zp"/>
@@ -480,10 +515,12 @@
                             <constraint firstItem="9oE-2Y-Zjp" firstAttribute="bottom" secondItem="GF7-H3-tD1" secondAttribute="bottom" constant="157" id="ab5-oD-MFi"/>
                             <constraint firstItem="9oE-2Y-Zjp" firstAttribute="trailing" secondItem="uLg-AT-jcT" secondAttribute="trailing" id="cGV-MQ-Psy"/>
                             <constraint firstItem="9oE-2Y-Zjp" firstAttribute="trailing" secondItem="ltI-lH-4P6" secondAttribute="trailing" id="eP7-k3-ubd"/>
+                            <constraint firstItem="2IB-7x-xqq" firstAttribute="top" secondItem="9oE-2Y-Zjp" secondAttribute="top" constant="90" id="fEn-A6-525"/>
                             <constraint firstItem="v19-dx-mpH" firstAttribute="leading" secondItem="9oE-2Y-Zjp" secondAttribute="leading" constant="2" id="ixV-MX-u6c"/>
                             <constraint firstItem="9oE-2Y-Zjp" firstAttribute="bottom" secondItem="3M5-Qw-9Er" secondAttribute="bottom" id="pkj-QA-8IG"/>
                             <constraint firstItem="oGO-U0-ITi" firstAttribute="leading" secondItem="9oE-2Y-Zjp" secondAttribute="leading" id="sDY-5x-Ccb"/>
                             <constraint firstItem="9oE-2Y-Zjp" firstAttribute="trailing" secondItem="HiH-Sa-EpJ" secondAttribute="trailing" id="ubc-bu-ZJ8"/>
+                            <constraint firstItem="9oE-2Y-Zjp" firstAttribute="trailing" secondItem="2IB-7x-xqq" secondAttribute="trailing" id="x8v-1r-XRC"/>
                             <constraint firstItem="9oE-2Y-Zjp" firstAttribute="bottom" secondItem="ltI-lH-4P6" secondAttribute="bottom" id="yQN-8S-kdU"/>
                         </constraints>
                     </view>
@@ -511,8 +548,8 @@
                         <outlet property="mWeatherChangeDegreesC" destination="UAF-MV-id5" id="Y2D-pV-RhX"/>
                         <outlet property="mWeatherChangeDegreesF" destination="fDb-Ef-cz9" id="szd-hO-iGa"/>
                         <outlet property="mWeatherChangeWhiteView" destination="f0v-is-cxh" id="m1t-PN-0EX"/>
-                        <outlet property="mWeatherDegrees" destination="SUr-1E-nHH" id="Tx7-rZ-5fP"/>
-                        <outlet property="mWeatherState" destination="RUs-hH-k8w" id="1JY-lI-Ggg"/>
+                        <outlet property="mWeatherDegrees" destination="c3G-f0-VXg" id="zZi-tU-zvI"/>
+                        <outlet property="mWeatherState" destination="EBs-Wo-ifM" id="Fm2-VW-lie"/>
                         <outlet property="mWeatherView" destination="2IB-7x-xqq" id="J8H-Fr-xpG"/>
                         <outlet property="mWeatherWhiteView" destination="W8Q-dc-H9X" id="udZ-Vx-FRX"/>
                         <outlet property="networkLabel" destination="k9x-JQ-0gZ" id="gaD-Eo-Y2S"/>

+ 4 - 1
artimenring-iOS/Artimenring/Classes/ViewController/Location/SKMainViewController+watch.m

@@ -77,7 +77,10 @@
     
     NSInteger type = [model.textCode integerValue];
     NSString* imageName = [NSString stringWithFormat:@"%@%ld", @"weather_type_", type];
-    [self.mWeatherState setImage:[UIImage imageNamed:imageName]];
+    UIImage* image = [UIImage imageNamed:imageName];
+    if (image) {
+        [self.mWeatherState setImage:image];
+    }
     
     //0:代表摄氏 1代表华氏
     NSInteger temperature = model.now;