Skip to content

Commit 660c33b

Browse files
author
CyJaySong
committed
update sdk
1 parent 0fd025d commit 660c33b

18 files changed

+289
-59
lines changed

‎android/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ android {
4545

4646
dependencies {
4747
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
48-
implementation files('libs/QWeather_Public_Android_V4.4.jar')
48+
implementation files('libs/QWeather_Public_Android_V4.5.jar')
4949
compile 'com.squareup.okhttp3:okhttp:3.9.0+'
5050
compile 'com.google.code.gson:gson:2.6.2+'
5151
}

‎android/libs/QWeather_Public_Android_V4.4.jar‎

-171 KB
Binary file not shown.

‎android/libs/QWeather_Public_Android_V4.5.jar‎

212 KB
Binary file not shown.

‎ios/QWeather.framework/Headers/AllWeatherInquieirs.h‎

Lines changed: 41 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,16 @@ typedef NS_ENUM(NSInteger, INQUIRE_TYPE) {
3232
INQUIRE_TYPE_WARNINGLIST,//天气灾害预警城市列表
3333
INQUIRE_TYPE_INDICES_1D,// 当天生活指数
3434
INQUIRE_TYPE_INDICES_3D,// 3天生活指数
35-
INQUIRE_TYPE_WEATHER_POI_NOW,//景点实况天气
36-
INQUIRE_TYPE_WEATHER_POI_7D,//景点7天预报
3735
INQUIRE_TYPE_HISTORICAL_WEATHER,// 历史天气
3836
INQUIRE_TYPE_HISTORICAL_AIR,//历史空气质量
39-
INQUIRE_TYPE_SUNMOON,//太阳和月亮
37+
INQUIRE_TYPE_ASTRONOMY_SUN,//日出日落
38+
INQUIRE_TYPE_ASTRONOMY_MOON,//月出月落
39+
INQUIRE_TYPE_ASTRONOMY_SUN_ANGLE,//太阳高度角
40+
INQUIRE_TYPE_STORM_LIST,//台风列表
41+
INQUIRE_TYPE_STORM_TRACK,//台风实况和路径
42+
INQUIRE_TYPE_STORM_FORECAST,//台风预报
43+
INQUIRE_TYPE_OCEAN_TIDE,//潮汐
44+
INQUIRE_TYPE_OCEAN_CURRENTS,//潮流
4045
INQUIRE_TYPE_GEO_CITY_LOOKUP,//城市查询
4146
INQUIRE_TYPE_GEO_TOPCITY,//热门城市查询
4247
INQUIRE_TYPE_GEO_POI_LOOKUP,//POI搜索
@@ -102,8 +107,18 @@ typedef NS_ENUM(NSInteger, INDICES_TYPE) {
102107
INDICES_TYPE_spi = 16,//防晒指数
103108
INDICES_TYPE_ski = 17,//滑雪指数
104109
};
105-
110+
111+
typedef NS_ENUM(NSInteger, BASIN_TYPE) {
112+
BASIN_TYPE_AL = 0,//北大西洋
113+
BASIN_TYPE_EP,//东太平洋
114+
BASIN_TYPE_NP,//西北太平洋
115+
BASIN_TYPE_SP,//西南太平洋
116+
BASIN_TYPE_NI,//北印度洋
117+
BASIN_TYPE_SI,//南印度洋
118+
};
119+
106120
UIKIT_EXTERN NSString * const INDICES_TYPESTRING[];
121+
107122
typedef NS_ENUM(NSInteger, SERCHMODE_TYPE) {
108123
SERCHMODE_TYPE_EXACT= 0,//精准查询
109124
SERCHMODE_TYPE_FUZZY = 1,//模糊搜索
@@ -198,6 +213,28 @@ typedef NS_ENUM(NSInteger, SERCHMODE_TYPE) {
198213

199214
@property (nonatomic, copy) NSString *alt;
200215

216+
/**
217+
需要查询的台风所在的流域，例如中国处于西北太平洋，即 basin=NP。当前仅支持NP。
218+
AL North Atlantic 北大西洋
219+
EP Eastern Pacific 东太平洋
220+
NP NorthWest Pacific 西北太平洋
221+
SP SouthWestern Pacific 西南太平洋
222+
NI North Indian 北印度洋
223+
SI South Indian 南印度洋
224+
必选
225+
*/
226+
227+
@property (nonatomic, assign) BASIN_TYPE basin;
228+
229+
/**
230+
支持查询本年度和上一年度的台风，例如：year=2020, year=2019
231+
*/
232+
@property (nonatomic, copy) NSString *year;
233+
234+
/**
235+
需要查询的台风ID，StormID可通过台风查询API获取。例如 stormid=NP2018
236+
*/
237+
@property (nonatomic, copy) NSString *stormID;
201238
#pragma mark - 可选参数
202239

203240
/**

‎ios/QWeather.framework/Headers/DataBaseClasses.h‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,18 @@
1212
#import "AirBaseClass.h"
1313
#import "WarningBaseClass.h"
1414
#import "WarningListClass.h"
15-
#import "WeatherPoiBaseClass.h"
1615
#import "GeoBaseClass.h"
1716
#import "WeatherMinutelyBaseClass.h"
1817
#import "WeatherHistoricalBaseClass.h"
1918
#import "IndicesBaseClass.h"
2019
#import "WeatherBaseClass.h"
21-
#import "SunMoonBaseModel.h"
20+
#import "SunBaseModel.h"
21+
#import "MoonBaseModel.h"
22+
#import "SunAngleBaseModel.h"
23+
#import "OceanTideBaseClass.h"
24+
#import "OceanCurrentsBaseClass.h"
25+
#import "StormListBaseClass.h"
26+
#import "StormNowTrackBaseClass.h"
27+
#import "StormForecastBaseClass.h"
28+
2229
#endif /* DataBaseClasses_h */

ios/QWeather.framework/Headers/SunMoonBaseModel.h renamed to ios/QWeather.framework/Headers/MoonBaseModel.h

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,25 @@
11
//
2-
// SunMoonBaseModel.h
2+
// MoonBaseModel.h
33
// QWeather
44
//
5-
// Created by he on 2020/6/8.
6-
// Copyright © 2020 Song. All rights reserved.
5+
// Created by hefeng on 2021/5/14.
6+
// Copyright © 2021 Song. All rights reserved.
77
//
88

9-
#import "QWeatherBaseModel.h"
9+
#import <QWeather/QWeather.h>
1010

1111
NS_ASSUME_NONNULL_BEGIN
1212
@class MoonPhase,Refer;
13-
@interface SunMoonBaseModel : QWeatherBaseModel
13+
@interface MoonBaseModel : QWeatherBaseModel
1414
@property (nonatomic , copy) NSString * code;
1515
@property (nonatomic , copy) NSString * updateTime;
1616
@property (nonatomic , copy) NSString * fxLink;
17-
@property (nonatomic , copy) NSString * sunrise;
18-
@property (nonatomic , copy) NSString * sunset;
1917
@property (nonatomic , copy) NSString * moonrise;
2018
@property (nonatomic , copy) NSString * moonset;
2119
@property (nonatomic,strong) NSArray<MoonPhase *> *moonPhases;
2220
@property (nonatomic , strong) Refer *refer;
2321
@end
22+
2423
@interface MoonPhase : QWeatherBaseModel
2524
@property (nonatomic,copy) NSString *fxTime;
2625
@property (nonatomic,copy) NSString *value;

‎ios/QWeather.framework/Headers/OceanCurrentsBaseClass.h‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
//
2+
// OceanCurrentsBaseClass.h
3+
// QWeather
4+
//
5+
// Created by hefeng on 2021/5/14.
6+
// Copyright © 2021 Song. All rights reserved.
7+
//
8+
9+
#import <QWeather/QWeather.h>
10+
11+
NS_ASSUME_NONNULL_BEGIN
12+
@class CurrentsTable,CurrentsHourly,Refer;
13+
14+
@interface OceanCurrentsBaseClass : QWeatherBaseModel
15+
@property (nonatomic , copy) NSString * code;
16+
@property (nonatomic , copy) NSString * updateTime;
17+
@property (nonatomic , copy) NSString * fxLink;
18+
@property (nonatomic, strong) NSArray<CurrentsTable *> *currentsTable;
19+
@property (nonatomic, strong) NSArray<CurrentsHourly *> *currentsHourly;
20+
@property (nonatomic , strong) Refer *refer;
21+
@end
22+
@interface CurrentsTable : QWeatherBaseModel
23+
@property (nonatomic, copy) NSString *dir360;
24+
@property (nonatomic, copy) NSString *fxTime;
25+
@property (nonatomic, copy) NSString *speedMax;
26+
@end
27+
28+
@interface CurrentsHourly : QWeatherBaseModel
29+
@property (nonatomic, copy) NSString *dir360;
30+
@property (nonatomic, copy) NSString *fxTime;
31+
@property (nonatomic, copy) NSString *speed;
32+
@end
33+
34+
NS_ASSUME_NONNULL_END

‎ios/QWeather.framework/Headers/OceanTideBaseClass.h‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
//
2+
// OceanTideBaseClass.h
3+
// QWeather
4+
//
5+
// Created by hefeng on 2021/5/14.
6+
// Copyright © 2021 Song. All rights reserved.
7+
//
8+
9+
#import <QWeather/QWeather.h>
10+
11+
NS_ASSUME_NONNULL_BEGIN
12+
@class TideTable,TideHourly,Refer;
13+
14+
@interface OceanTideBaseClass : QWeatherBaseModel
15+
@property (nonatomic , copy) NSString * code;
16+
@property (nonatomic , copy) NSString * updateTime;
17+
@property (nonatomic , copy) NSString * fxLink;
18+
@property (nonatomic, strong) NSArray<TideTable *> *tideTable;
19+
@property (nonatomic, strong) NSArray<TideHourly *> *tideHourly;
20+
@property (nonatomic , strong) Refer *refer;
21+
@end
22+
@interface TideTable : QWeatherBaseModel
23+
@property (nonatomic, copy) NSString *fxTime;
24+
@property (nonatomic, copy) NSString *height;
25+
@property (nonatomic, copy) NSString *type;
26+
@end
27+
28+
@interface TideHourly : QWeatherBaseModel
29+
@property (nonatomic, copy) NSString *fxTime;
30+
@property (nonatomic, copy) NSString *height;
31+
@end
32+
33+
34+
NS_ASSUME_NONNULL_END

‎ios/QWeather.framework/Headers/QWeather.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ FOUNDATION_EXPORT const unsigned char QWeatherVersionString[];
1717
// #import <QWeather/QWeather.h>
1818

1919

20-
/* 当前版本 2021-03-29 4.3 */
20+
/* 当前版本 2021-05-17 4.4 */
2121

2222
/**
2323
* 写在前面的（废）话

‎ios/QWeather.framework/Headers/StormForecastBaseClass.h‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
//
2+
// StormForecastBaseClass.h
3+
// QWeather
4+
//
5+
// Created by hefeng on 2021/5/14.
6+
// Copyright © 2021 Song. All rights reserved.
7+
//
8+
9+
#import <QWeather/QWeather.h>
10+
11+
NS_ASSUME_NONNULL_BEGIN
12+
@class StormForecast,Refer;
13+
14+
@interface StormForecastBaseClass : QWeatherBaseModel
15+
@property (nonatomic , strong) Refer *refer;
16+
@property (nonatomic, copy) NSString *code;
17+
@property (nonatomic, copy) NSString *updateTime;
18+
@property (nonatomic, copy) NSString *fxLink;
19+
@property (nonatomic, strong)NSArray<StormForecast*> *forecast;
20+
@end
21+
@interface StormForecast : QWeatherBaseModel
22+
@property (nonatomic, copy) NSString *fxTime;
23+
@property (nonatomic, copy) NSString *lat;
24+
@property (nonatomic, copy) NSString *lon;
25+
@property (nonatomic, copy) NSString *type;
26+
@property (nonatomic, copy) NSString *pressure;
27+
@property (nonatomic, copy) NSString *windSpeed;
28+
@property (nonatomic, copy) NSString *moveSpeed;
29+
@property (nonatomic, copy) NSString *move360;
30+
@end
31+
NS_ASSUME_NONNULL_END

0 commit comments

Comments
 (0)