更新了 24 小时天气预报 API 调用功能，库调用方法略微改动。

WinExp · WinExp · commit a5c1d79383ab · 2022-04-02T13:50:02.000+08:00
diff --git a/src/ExampleApp/ExampleConsoleApp/ExampleConsoleApp.csproj b/src/ExampleApp/ExampleConsoleApp/ExampleConsoleApp.csproj
@@ -5,6 +5,10 @@
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <Version>1.1.0</Version>
+    <AssemblyVersion>1.1.0.*</AssemblyVersion>
+    <FileVersion>1.1.0.*</FileVersion>
+	<Deterministic>False</Deterministic>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/ExampleApp/ExampleConsoleApp/Program.cs b/src/ExampleApp/ExampleConsoleApp/Program.cs
@@ -3,20 +3,32 @@
     class Program
     {
         static void Main()
+        {
+            GetWeatherAsync().Wait();
+        }
+
+        private static async Task GetWeatherAsync()
         {
             Console.Write("请输入 API 密钥：");
             string key = Console.ReadLine();
             Console.Write("请输入地点名称：");
             string location = Console.ReadLine();
             try
             {
-                var locationInfo = QWeatherAPI.QWeather.GetGeoAsync(location, key).Result.Locations[0];
-                var weatherInfo = QWeatherAPI.QWeather.GetRealTimeWeatherAsync(locationInfo.Lon, locationInfo.Lat, "af71f6c5c1e94ec4abf618febf35ca68").Result;
-                Console.WriteLine(@$"{locationInfo.Name}的天气
-当前温度 {weatherInfo.Now.Temp}°C
-体感温度 {weatherInfo.Now.FeelsLike}°C
-{weatherInfo.Now.Text}
-{weatherInfo.Now.WindDir}");
+                var locationInfo = (await QWeatherAPI.GeoAPI.GetGeoAsync(location, key)).Locations[0];
+                var realTimeWeatherInfo = await QWeatherAPI.RealTimeWeatherAPI.GetRealTimeWeatherAsync(locationInfo.Lon, locationInfo.Lat, key);
+                var forecastWeatherInfo = await QWeatherAPI.WeatherHourlyForecastAPI.GetHourlyForecastWeatherAsync(locationInfo.Lon, locationInfo.Lat, key);
+                Console.WriteLine(@$"{locationInfo.Name} 的天气
+当前温度 {realTimeWeatherInfo.Now.Temp}°C
+体感温度 {realTimeWeatherInfo.Now.FeelsLike}°C
+{realTimeWeatherInfo.Now.Text}
+{realTimeWeatherInfo.Now.WindDir}
+
+明天 {forecastWeatherInfo.Hourly[23].FxTime} 的天气
+温度 {forecastWeatherInfo.Hourly[23].Temp}
+{forecastWeatherInfo.Hourly[23].Text}
+{forecastWeatherInfo.Hourly[23].WindDir}
+");
             }
             catch (ArgumentException ex)
             {
diff --git a/src/QWeather/GeoAPI.cs b/src/QWeather/GeoAPI.cs
@@ -0,0 +1,48 @@
+﻿using QWeatherAPI.Result.GeoAPI.CityLookup;
+using QWeatherAPI.Tools.Net.Http;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace QWeatherAPI
+{
+    public class GeoAPI
+    {
+        #region 获取城市地理信息方法
+        /// <summary>
+        /// 通过地区名称获取 LocationID 和 经纬度。
+        /// </summary>
+        /// <param name="location">地区名称，支持绝大多数语言。</param>
+        /// <param name="key">和风天气 API 密钥。</param>
+        /// <param name="adm">城市的上级行政区划。</param>
+        /// <param name="range">搜索限定范围。国家代码需使用 ISO 3166 所定义的国家代码，默认为 10。详情请参考：https://www.iso.org/obp/ui/</param>
+        /// <param name="limit">地理位置 API 返回数据限制个数。</param>
+        /// <param name="lang">返回数据语言，默认采用中文。详情请参考：https://dev.qweather.com/docs/resource/language/</param>
+        /// <returns>城市信息 API 返回数据。</returns>
+        public static async Task<GeoResult> GetGeoAsync(string location, string key, string adm, string range = "world", int limit = 10, string lang = "zh")
+        {
+            range = range.ToLower();
+            string jsonData = await WebRequests.GetRequestAsync($"https://geoapi.qweather.com/v2/city/lookup?location={location}&number={limit}&adm={adm}&range={range}&lang={lang}&key={key}");
+            return new GeoResult(jsonData);
+        }
+
+        /// <summary>
+        /// 通过地区名称获取 LocationID 和 经纬度。
+        /// </summary>
+        /// <param name="location">地区名称，支持绝大多数语言。</param>
+        /// <param name="key">和风天气 API 密钥。</param>
+        /// <param name="range">搜索限定范围。国家代码需使用 ISO 3166 所定义的国家代码，默认为 10。详情请参考：https://www.iso.org/obp/ui/</param>
+        /// <param name="limit">地理位置 API 返回数据限制个数。</param>
+        /// <param name="lang">返回数据语言，默认采用中文。详情请参考：https://dev.qweather.com/docs/resource/language/</param>
+        /// <returns>城市信息 API 返回数据。</returns>
+        public static async Task<GeoResult> GetGeoAsync(string location, string key, string range = "world", int limit = 10, string lang = "zh")
+        {
+            range = range.ToLower();
+            string jsonData = await WebRequests.GetRequestAsync($"https://geoapi.qweather.com/v2/city/lookup?location={location}&number={limit}&range={range}&lang={lang}&key={key}");
+            return new GeoResult(jsonData);
+        }
+        #endregion
+    }
+}
diff --git a/src/QWeather/QWeatherAPI.csproj b/src/QWeather/QWeatherAPI.csproj
@@ -12,10 +12,11 @@
     <PackageIcon>天气 (3).png</PackageIcon>
     <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <AssemblyVersion>1.0.1.0</AssemblyVersion>
-    <FileVersion>1.0.1.0</FileVersion>
+    <AssemblyVersion>1.1.0.*</AssemblyVersion>
+    <FileVersion>1.1.0.*</FileVersion>
     <PlatformTarget>x64</PlatformTarget>
-    <Version>1.0.1</Version>
+    <Version>1.1.0</Version>
+	<Deterministic>False</Deterministic>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/QWeather/RealTimeWeatherAPI.cs b/src/QWeather/RealTimeWeatherAPI.cs
@@ -0,0 +1,71 @@
+﻿using QWeatherAPI.Result.RealTimeWeather;
+using QWeatherAPI.Tools;
+using QWeatherAPI.Tools.Net.Http;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace QWeatherAPI
+{
+    public static class RealTimeWeatherAPI
+    {
+        #region 获取实时天气方法
+        /// <summary>
+        /// 通过经度，纬度获取实时天气 API 数据。
+        /// </summary>
+        /// <param name="lon">地区经度。</param>
+        /// <param name="lat">地区纬度。</param>
+        /// <param name="key">和风天气 API 密钥。</param>
+        /// <param name="unit">测量单位，Tools.Units.Metric 为公制，Tools.Units.Inch 为英制，默认采用 公制。</param>
+        /// <param name="lang">返回数据语言，默认采用中文。详情请参考：https://dev.qweather.com/docs/resource/language/</param>
+        /// <returns>实时天气 API 返回数据。</returns>
+        public static async Task<WeatherResult> GetRealTimeWeatherAsync(double lon, double lat, string key, Units unit = Units.Metric, string lang = "zh")
+        {
+            string _unit;
+            switch (unit)
+            {
+                case Units.Metric:
+                    _unit = "m";
+                    break;
+                case Units.Inch:
+                    _unit = "i";
+                    break;
+                default:
+                    goto case Units.Metric;
+            }
+            string jsonData = await WebRequests.GetRequestAsync($"https://devapi.qweather.com/v7/weather/now?location={lon},{lat}&lang={lang}&unit={_unit}&key={key}");
+            var weather = new WeatherResult(jsonData);
+            return weather;
+        }
+
+        /// <summary>
+        /// 通过 LocationID 获取和风天气实时天气 API 数据。
+        /// </summary>
+        /// <param name="id">地区 LocationID，可通过 GeoAPI.GetGeoAsync() 来获取。</param>
+        /// <param name="key">和风天气 API 密钥。</param>
+        /// <param name="unit">测量单位，Tools.Units.Metric 为公制，Tools.Units.Inch 为英制，默认采用 公制。</param>
+        /// <param name="lang">返回数据语言，默认采用中文。详情请参考：https://dev.qweather.com/docs/resource/language/</param>
+        /// <returns>实时天气 API 返回数据。</returns>
+        public static async Task<WeatherResult> GetRealTimeWeatherAsync(string id, string key, Units unit = Units.Metric, string lang = "zh")
+        {
+            string _unit;
+            switch (unit)
+            {
+                case Units.Metric:
+                    _unit = "m";
+                    break;
+                case Units.Inch:
+                    _unit = "i";
+                    break;
+                default:
+                    goto case Units.Metric;
+            }
+            string jsonData = await WebRequests.GetRequestAsync($"https://devapi.qweather.com/v7/weather/now?location={id}&lang={lang}&unit={_unit}&key={key}");
+            var weather = new WeatherResult(jsonData);
+            return weather;
+        }
+        #endregion
+    }
+}
diff --git a/src/QWeather/Result/GeoAPI/CityLookup/GeoResult.cs b/src/QWeather/Result/GeoAPI/CityLookup/GeoResult.cs
@@ -17,7 +17,7 @@ public class GeoResult
         /// <summary>
         /// 位置搜索结果
         /// </summary>
-        public List<Location> Locations = new List<Location>();
+        public Location[] Locations = Array.Empty<Location>();
         #endregion
 
         #region 构造方法
@@ -33,7 +33,9 @@ public GeoResult(string jsonString)
             if (this.Code != "200") { throw new ArgumentException(this.Code); }
             foreach (JToken location in jsonData.SelectToken("location"))
             {
-                this.Locations.Add(new Location(location));
+                var locationList = this.Locations.ToList();
+                locationList.Add(new Location(location));
+                this.Locations = locationList.ToArray();
             }
         }
         #endregion
diff --git a/src/QWeather/Result/RealTimeWeather/Now.cs b/src/QWeather/Result/RealTimeWeather/Now.cs
@@ -88,10 +88,8 @@ public Now(JToken token)
             this.Precip = token.Value<string>("precip");
             this.Pressure = token.Value<string>("pressure");
             this.Vis = token.Value<string>("vis");
-#nullable enable
             this.Cloud = token.Value<string?>("cloud");
             this.Dew = token.Value<string?>("dew");
-#nullable restore
         }
         #endregion
     }
diff --git a/src/QWeather/Result/WeatherHourlyForecast/Hourly.cs b/src/QWeather/Result/WeatherHourlyForecast/Hourly.cs
@@ -0,0 +1,86 @@
+﻿using Newtonsoft.Json.Linq;
+
+namespace QWeatherAPI.Result.WeatherHourlyForecast
+{
+    public class Hourly
+    {
+        #region 声明字段
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        public string FxTime;
+        /// <summary>
+        /// 温度
+        /// </summary>
+        public string Temp;
+        /// <summary>
+        /// 图标代码
+        /// </summary>
+        public string Icon;
+        /// <summary>
+        /// 天气情况文字介绍
+        /// </summary>
+        public string Text;
+        /// <summary>
+        /// 风向角度
+        /// </summary>
+        public string Wind360;
+        /// <summary>
+        /// 风向
+        /// </summary>
+        public string WindDir;
+        /// <summary>
+        /// 风力等级
+        /// </summary>
+        public string WindScale;
+        /// <summary>
+        /// 风速，公里/小时
+        /// </summary>
+        public string WindSpeed;
+        /// <summary>
+        /// 相对湿度，百分比数值
+        /// </summary>
+        public string Humidity;
+        /// <summary>
+        /// 逐小时预报降水概率，百分比数值（可能为空）
+        /// </summary>
+        public string Pop;
+        /// <summary>
+        /// 每小时降雨量（默认单位：毫米）
+        /// </summary>
+        public string Precip;
+        /// <summary>
+        /// 大气压强（默认单位：百帕）
+        /// </summary>
+        public string Pressure;
+        /// <summary>
+        /// 云量，百分比数值（可能为空）
+        /// </summary>
+        public string Cloud;
+        /// <summary>
+        /// 露点温度（可能为空）
+        /// </summary>
+        public string Dew;
+        #endregion
+
+        #region 构造方法
+        public Hourly(JToken token)
+        {
+            this.FxTime = token.Value<string>("fxTime");
+            this.Temp = token.Value<string>("temp");
+            this.Icon = token.Value<string>("icon");
+            this.Text = token.Value<string>("text");
+            this.Wind360 = token.Value<string>("wind360");
+            this.WindDir = token.Value<string>("windDir");
+            this.WindScale = token.Value<string>("windScale");
+            this.WindSpeed = token.Value<string>("windSpeed");
+            this.Humidity = token.Value<string>("humidity");
+            this.Pop = token.Value<string>("pop");
+            this.Precip = token.Value<string>("precip");
+            this.Pressure = token.Value<string>("pressure");
+            this.Cloud = token.Value<string?>("cloud");
+            this.Dew = token.Value<string?>("dew");
+        }
+        #endregion
+    }
+}
diff --git a/src/QWeather/Result/WeatherHourlyForecast/WeatherResult.cs b/src/QWeather/Result/WeatherHourlyForecast/WeatherResult.cs
@@ -0,0 +1,53 @@
+﻿using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace QWeatherAPI.Result.WeatherHourlyForecast
+{
+    public class WeatherResult
+    {
+        #region 声明字段
+        /// <summary>
+        /// API 状态码
+        /// </summary>
+        public string Code;
+        /// <summary>
+        /// API 最近更新时间
+        /// </summary>
+        public string UpdateTime;
+        /// <summary>
+        /// 当前数据的响应式页面，便于嵌入网站或应用
+        /// </summary>
+        public string FxLink;
+        /// <summary>
+        /// 24 小时预报结果
+        /// </summary>
+        public Hourly[] Hourly = Array.Empty<Hourly>();
+        #endregion
+
+        #region 构造方法
+        /// <summary>
+        /// 构造 24 天气预报 API 返回结果
+        /// </summary>
+        /// <param name="jsonString"></param>
+        /// <exception cref="ArgumentException"></exception>
+        public WeatherResult(string jsonString)
+        {
+            JObject jsonData = JObject.Parse(jsonString);
+            this.Code = jsonData.Value<string>("code");
+            if (this.Code != "200") { throw new ArgumentException(this.Code); }
+            this.UpdateTime = jsonData.Value<string>("updateTime");
+            this.FxLink = jsonData.Value<string>("fxLink");
+            foreach (var item in jsonData.SelectToken("hourly"))
+            {
+                var hourlyList = this.Hourly.ToList();
+                hourlyList.Add(new Hourly(item));
+                this.Hourly = hourlyList.ToArray();
+            }
+        }
+        #endregion
+    }
+}
diff --git a/src/QWeather/Tools/Units.cs b/src/QWeather/Tools/Units.cs
@@ -0,0 +1,16 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace QWeatherAPI.Tools
+{
+    #region 单位枚举
+    public enum Units
+    {
+        Metric,
+        Inch
+    }
+    #endregion
+}
diff --git a/src/QWeather/Weather.cs b/src/QWeather/Weather.cs
diff --git a/src/QWeather/WeatherHourlyForecastAPI.cs b/src/QWeather/WeatherHourlyForecastAPI.cs

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public class GeoResult`
`17`	`17`	`/// <summary>`
`18`	`18`	`/// 位置搜索结果`
`19`	`19`	`/// </summary>`
`20`		`- public List<Location> Locations = new List<Location>();`
	`20`	`+ public Location[] Locations = Array.Empty<Location>();`
`21`	`21`	`#endregion`
`22`	`22`
`23`	`23`	`#region 构造方法`
`@@ -33,7 +33,9 @@ public GeoResult(string jsonString)`
`33`	`33`	`if (this.Code != "200") { throw new ArgumentException(this.Code); }`
`34`	`34`	`foreach (JToken location in jsonData.SelectToken("location"))`
`35`	`35`	`{`
`36`		`- this.Locations.Add(new Location(location));`
	`36`	`+ var locationList = this.Locations.ToList();`
	`37`	`+ locationList.Add(new Location(location));`
	`38`	`+ this.Locations = locationList.ToArray();`
`37`	`39`	`}`
`38`	`40`	`}`
`39`	`41`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -88,10 +88,8 @@ public Now(JToken token)`
`88`	`88`	`this.Precip = token.Value<string>("precip");`
`89`	`89`	`this.Pressure = token.Value<string>("pressure");`
`90`	`90`	`this.Vis = token.Value<string>("vis");`
`91`		`-#nullable enable`
`92`	`91`	`this.Cloud = token.Value<string?>("cloud");`
`93`	`92`	`this.Dew = token.Value<string?>("dew");`
`94`		`-#nullable restore`
`95`	`93`	`}`
`96`	`94`	`#endregion`
`97`	`95`	`}`