显示天气

artimenring-iOS/Artimenring/Base.lproj/Main.storyboard

@@ -183,14 +183,14 @@
                                                         </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="3" y="3" width="18" height="18"/>
+                                                        <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="47.666666666666664" y="0.0" width="29.333333333333336" height="24"/>
+                                                        <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>
@@ -212,13 +212,13 @@
                                                 </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="3" id="2y5-6x-5WK"/>
+                                                    <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="3" id="hUX-Cz-XKa"/>
+                                                    <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>

artimenring-iOS/Artimenring/Classes/Util/EUtil.mm

@@ -1099,15 +1099,18 @@ void Log(const char * format, ...)
     }
 }
 
-+ (void)setUserDefaults:(NSString*)key number:(NSNumber*)number
-{
++ (void)setUserDefaults:(NSString*)key number:(NSNumber*)number {
     [[NSUserDefaults standardUserDefaults] setObject:number forKey:key];
     [[NSUserDefaults standardUserDefaults] synchronize];
 }
 
 +(NSNumber*)getUserDefaults:(NSString*)key {
     NSNumber* number = [[NSUserDefaults standardUserDefaults] objectForKey:key];
-    return number == nil ? [NSNumber numberWithInteger:0] : number;
+    if (number == nil) {
+        [self setUserDefaults:key number:[NSNumber numberWithInteger:0]];
+        return [self getUserDefaults:key];
+    }
+    return number;
 }
 
 + (id)getBundleView:(NSString*)viewName {

artimenring-iOS/Artimenring/Classes/ViewController/Location/MainViewController+watch.m

@@ -79,17 +79,11 @@
     NSString* imageName = [NSString stringWithFormat:@"%@%ld", @"weather_type_", type];
     [self.mWeatherState setImage:[UIImage imageNamed:imageName]];
     
-    //1代表华氏，2代表摄氏
+    //0:代表摄氏 1代表华氏
     NSInteger temperature = model.now;
-    NSInteger unit = 0; //0代表华氏，1代表摄氏
     NSNumber* weatherType = [EUtil getUserDefaults:@"KEY_TYPE_WEATHER"];
-    if ([weatherType intValue] != unit) {
-        if ([weatherType intValue] == 1){
-            temperature = temperature*9/5 + 32;
-        }
-        else {
-            temperature = (temperature - 32)*5/9;
-        }
+    if ([weatherType intValue] == 1){
+        temperature = temperature*9/5 + 32;
     }
 
     if (type <= 0) {
@@ -99,8 +93,8 @@
     }
     
     UIColor* normal = [UIColor colorWithRed:0/255.0f green:1/255.0f blue:0/255.0f alpha:0.4];
-    UIColor* high = [UIColor colorWithRed:0/255.0f green:1/255.0f blue:75/255.0f alpha:1];
-    [self.mWeatherChangeDegreesC setTextColor:[weatherType intValue] == 2? high:normal];
+    UIColor* high = [UIColor colorWithRed:0/255.0f green:0/255.0f blue:0/255.0f alpha:1];
+    [self.mWeatherChangeDegreesC setTextColor:[weatherType intValue] == 0? high:normal];
     [self.mWeatherChangeDegreesF setTextColor:[weatherType intValue] == 1? high:normal];
     
     [self.mAirState setImage:[UIImage imageNamed:[NSString stringWithFormat:@"%@%ld", @"weather_aqi_", (long)_airState]]];
@@ -161,9 +155,9 @@
 
 - (IBAction)onWeatherChangeAction:(id)sender {
     NSNumber* number = [EUtil getUserDefaults:@"KEY_TYPE_WEATHER"];
-    if (!number || [number intValue] == 0) {
-        //1代表华氏，2代表摄氏
-        [EUtil setUserDefaults:@"KEY_TYPE_WEATHER" number:[number intValue] == 0 ? @(1):@(2)];
+    if (number) {
+        //0:代表摄氏 1代表华氏
+        [EUtil setUserDefaults:@"KEY_TYPE_WEATHER" number:[number intValue] == 0 ? @(1):@(0)];
     }
     [self refreshWeather];
 }

artimenring-iOS/Artimenring/Images.xcassets/Weather/weatcher_type_104.imageset/Contents.json

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

artimenring-iOS/Artimenring/Images.xcassets/Weather/weatcher_type_105.imageset/Contents.json

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

artimenring-iOS/Artimenring/Images.xcassets/Weather/weatcher_type_106.imageset/Contents.json

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

artimenring-iOS/Artimenring/Images.xcassets/Weather/weatcher_type_107.imageset/Contents.json

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

artimenring-iOS/Artimenring/Images.xcassets/Weather/weatcher_type_100.imageset/Contents.json → artimenring-iOS/Artimenring/Images.xcassets/Weather/weather_type_100.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "weatcher_type_100@2x.png",
+      "filename" : "weather_type_100@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "weatcher_type_100@3x.png",
+      "filename" : "weather_type_100@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

artimenring-iOS/Artimenring/Images.xcassets/Weather/weatcher_type_101.imageset/Contents.json → artimenring-iOS/Artimenring/Images.xcassets/Weather/weather_type_101.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "weatcher_type_101@2x.png",
+      "filename" : "weather_type_101@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "weatcher_type_101@3x.png",
+      "filename" : "weather_type_101@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

artimenring-iOS/Artimenring/Images.xcassets/Weather/weatcher_type_102.imageset/Contents.json → artimenring-iOS/Artimenring/Images.xcassets/Weather/weather_type_102.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "weatcher_type_102@2x.png",
+      "filename" : "weather_type_102@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "weatcher_type_102@3x.png",
+      "filename" : "weather_type_102@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

artimenring-iOS/Artimenring/Images.xcassets/Weather/weatcher_type_103.imageset/Contents.json → artimenring-iOS/Artimenring/Images.xcassets/Weather/weather_type_103.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "weatcher_type_103@2x.png",
+      "filename" : "weather_type_103@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "weatcher_type_103@3x.png",
+      "filename" : "weather_type_103@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

artimenring-iOS/Artimenring/Images.xcassets/Weather/weather_type_104.imageset/Contents.json

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

artimenring-iOS/Artimenring/Images.xcassets/Weather/weather_type_105.imageset/Contents.json

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

artimenring-iOS/Artimenring/Images.xcassets/Weather/weather_type_106.imageset/Contents.json

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

artimenring-iOS/Artimenring/Images.xcassets/Weather/weather_type_107.imageset/Contents.json

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