Skip to content

Commit 243bffd

Browse files
author
Hevin
committed
Merge branch 'v2-dev'
2 parents 213bde3 + ab9d305 commit 243bffd

File tree

8 files changed

+34
-28
lines changed

8 files changed

+34
-28
lines changed

‎Example/Example.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ private static void ExecutePushExample()
2323
{
2424
PushPayload pushPayload = new PushPayload()
2525
{
26-
Platform = "all",
26+
Platform = new List<string> { "android", "ios" },
2727
Audience = "all",
2828
Notification = new Notification()
2929
{

‎Jiguang.JPush/DeviceClient.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public async Task<HttpResponse> GetDeviceInfoAsync(string registrationId)
3636
/// </param>
3737
public HttpResponse GetDeviceInfo(string registrationId)
3838
{
39-
Task<HttpResponse> task = Task.Run(() => GetDeviceInfoAsync(registrationId));
39+
Task<HttpResponse> task = GetDeviceInfoAsync(registrationId);
4040
task.Wait();
4141
return task.Result;
4242
}
@@ -81,7 +81,7 @@ public async Task<HttpResponse> UpdateDeviceInfoAsync(string registrationId, Dev
8181
/// <param name="devicePayload">设备信息对象</param>
8282
public HttpResponse UpdateDeviceInfo(string registrationId, DevicePayload devicePayload)
8383
{
84-
Task<HttpResponse> task = Task.Run(() => UpdateDeviceInfoAsync(registrationId, devicePayload));
84+
Task<HttpResponse> task = UpdateDeviceInfoAsync(registrationId, devicePayload);
8585
task.Wait();
8686
return task.Result;
8787
}
@@ -112,7 +112,7 @@ public async Task<HttpResponse> GetDevicesByAliasAsync(string alias, string plat
112112
/// <param name="platform">"android" 或 "ios", 为 null 则默认为所有平台。</param>
113113
public HttpResponse GetDeviceByAlias(string alias, string platform)
114114
{
115-
Task<HttpResponse> task = Task.Run(() => GetDevicesByAliasAsync(alias, platform));
115+
Task<HttpResponse> task = GetDevicesByAliasAsync(alias, platform);
116116
task.Wait();
117117
return task.Result;
118118
}
@@ -142,7 +142,7 @@ public async Task<HttpResponse> DeleteAliasAsync(string alias, string platform)
142142
/// <param name="platform">"android" 或 "ios"，为 null 则默认为所有平台。</param>
143143
public HttpResponse DeleteAlias(string alias, string platform)
144144
{
145-
Task<HttpResponse> task = Task.Run(() => DeleteAliasAsync(alias, platform));
145+
Task<HttpResponse> task = DeleteAliasAsync(alias, platform);
146146
task.Wait();
147147
return task.Result;
148148
}
@@ -164,7 +164,7 @@ public async Task<HttpResponse> GetTagsAsync()
164164
/// </summary>
165165
public HttpResponse GetTags()
166166
{
167-
Task<HttpResponse> task = Task.Run(() => GetTagsAsync());
167+
Task<HttpResponse> task = GetTagsAsync();
168168
task.Wait();
169169
return task.Result;
170170
}
@@ -194,7 +194,7 @@ public async Task<HttpResponse> IsDeviceInTagAsync(string registrationId, string
194194
/// <param name="tag">要查询的 tag</param>
195195
public HttpResponse IsDeviceInTag(string registrationId, string tag)
196196
{
197-
Task<HttpResponse> task = Task.Run(() => IsDeviceInTagAsync(registrationId, tag));
197+
Task<HttpResponse> task = IsDeviceInTagAsync(registrationId, tag);
198198
task.Wait();
199199
return task.Result;
200200
}
@@ -233,7 +233,7 @@ public async Task<HttpResponse> AddDevicesToTagAsync(string tag, List<string> re
233233
/// <param name="registrationIdList">设备的 registration id 列表</param>
234234
public HttpResponse AddDevicesToTag(string tag, List<string> registrationIdList)
235235
{
236-
Task<HttpResponse> task = Task.Run(() => AddDevicesToTagAsync(tag, registrationIdList));
236+
Task<HttpResponse> task = AddDevicesToTagAsync(tag, registrationIdList);
237237
task.Wait();
238238
return task.Result;
239239
}
@@ -272,7 +272,7 @@ public async Task<HttpResponse> RemoveDevicesFromTagAsync(string tag, List<strin
272272
/// <param name="registrationIdList">设备的 registration id 列表</param>
273273
public HttpResponse RemoveDevicesFromTag(string tag, List<string> registrationIdList)
274274
{
275-
Task<HttpResponse> task = Task.Run(() => RemoveDevicesFromTagAsync(tag, registrationIdList));
275+
Task<HttpResponse> task = RemoveDevicesFromTagAsync(tag, registrationIdList);
276276
task.Wait();
277277
return task.Result;
278278
}
@@ -302,7 +302,7 @@ public async Task<HttpResponse> DeleteTagAsync(string tag, string platform)
302302
/// <param name="platform">"android" 或 "ios"，如果为 null，则默认为所有平台</param>
303303
public HttpResponse DeleteTag(string tag, string platform)
304304
{
305-
Task<HttpResponse> task = Task.Run(() => DeleteTagAsync(tag, platform));
305+
Task<HttpResponse> task = DeleteTagAsync(tag, platform);
306306
task.Wait();
307307
return task.Result;
308308
}
@@ -331,7 +331,7 @@ public async Task<HttpResponse> GetUserOnlineStatusAsync(List<string> registrati
331331
/// <param name="registrationIdList">待查询用户设备的 registration id，每次最多支持 1000 个。</param>
332332
public HttpResponse GetUserOnlineStatus(List<string> registrationIdList)
333333
{
334-
Task<HttpResponse> task = Task.Run(() => GetUserOnlineStatusAsync(registrationIdList));
334+
Task<HttpResponse> task = GetUserOnlineStatusAsync(registrationIdList);
335335
task.Wait();
336336
return task.Result;
337337
}

‎Jiguang.JPush/JPushClient.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public async Task<HttpResponse> SendPushAsync(PushPayload payload)
8989
/// <param name="pushPayload"> 推送对象。<see cref="https://docs.jiguang.cn/jpush/server/push/rest_api_v3_push/#_7"/> </param>
9090
public HttpResponse SendPush(PushPayload pushPayload)
9191
{
92-
Task<HttpResponse> task = Task.Run(() => SendPushAsync(pushPayload));
92+
Task<HttpResponse> task = SendPushAsync(pushPayload);
9393
task.Wait();
9494
return task.Result;
9595
}
@@ -124,7 +124,7 @@ public async Task<HttpResponse> IsPushValidAsync(PushPayload payload)
124124
/// <param name="pushPayload"> 推送对象。<see cref="https://docs.jiguang.cn/jpush/server/push/rest_api_v3_push/#_7"/> </param>
125125
public HttpResponse IsPushValid(PushPayload pushPayload)
126126
{
127-
Task<HttpResponse> task = Task.Run(() => IsPushValidAsync(pushPayload));
127+
Task<HttpResponse> task = IsPushValidAsync(pushPayload);
128128
task.Wait();
129129
return task.Result;
130130
}
@@ -160,7 +160,7 @@ public async Task<HttpResponse> GetCIdListAsync(int? count, string type)
160160
/// <param name="type">CId 的类型。取值："push" (默认) 或 "schedule"</param>
161161
public HttpResponse GetCIdList(int? count, string type)
162162
{
163-
Task<HttpResponse> task = Task.Run(() => GetCIdListAsync(count, type));
163+
Task<HttpResponse> task = GetCIdListAsync(count, type);
164164
task.Wait();
165165
return task.Result;
166166
}

‎Jiguang.JPush/Jiguang.JPush.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<Copyright>MIT</Copyright>
1313
<PackageLicenseUrl></PackageLicenseUrl>
1414
<PackageProjectUrl>https://github.com/jpush/jpush-api-csharp-client</PackageProjectUrl>
15-
<Version>1.1.3</Version>
15+
<Version>1.1.4</Version>
1616
</PropertyGroup>
1717

1818
<ItemGroup>

‎Jiguang.JPush/Jiguang.JPush.sln‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.27004.2008
4+
VisualStudioVersion = 15.0.27130.2027
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Jiguang.JPush", "Jiguang.JPush.csproj", "{876384B3-898F-4392-8E20-30A1D9E393F0}"
77
EndProject
88
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example", "..\Example\Example.csproj", "{E87821A4-FB7B-4744-8188-17C348ABCE55}"
99
EndProject
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApp2", "C:\Users\hasee\Downloads\ConsoleApp2\ConsoleApp2.csproj", "{BE150D1B-23E3-4EC3-A6AD-631DAA90D1E5}"
11+
EndProject
1012
Global
1113
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1214
Debug|Any CPU = Debug|Any CPU
@@ -21,6 +23,10 @@ Global
2123
{E87821A4-FB7B-4744-8188-17C348ABCE55}.Debug|Any CPU.Build.0 = Debug|Any CPU
2224
{E87821A4-FB7B-4744-8188-17C348ABCE55}.Release|Any CPU.ActiveCfg = Release|Any CPU
2325
{E87821A4-FB7B-4744-8188-17C348ABCE55}.Release|Any CPU.Build.0 = Release|Any CPU
26+
{BE150D1B-23E3-4EC3-A6AD-631DAA90D1E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27+
{BE150D1B-23E3-4EC3-A6AD-631DAA90D1E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
28+
{BE150D1B-23E3-4EC3-A6AD-631DAA90D1E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
29+
{BE150D1B-23E3-4EC3-A6AD-631DAA90D1E5}.Release|Any CPU.Build.0 = Release|Any CPU
2430
EndGlobalSection
2531
GlobalSection(SolutionProperties) = preSolution
2632
HideSolutionNode = FALSE

‎Jiguang.JPush/Model/PushPayload.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class PushPayload
1111
/// 推送平台。可以为 "android" / "ios" / "all"。
1212
/// </summary>
1313
[JsonProperty("platform", DefaultValueHandling = DefaultValueHandling.Include)]
14-
public string Platform { get; set; } = "all";
14+
public object Platform { get; set; } = "all";
1515

1616
[JsonProperty("audience", DefaultValueHandling = DefaultValueHandling.Include)]
1717
public object Audience { get; set; } = "all";

‎Jiguang.JPush/ReportClient.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public async Task<HttpResponse> GetMessageReportAsync(List<string> msgIdList)
4646
/// <param name="msgIdList">消息的 msg_id 列表，每次最多支持 100 个。</param>
4747
public HttpResponse GetMessageReport(List<string> msgIdList)
4848
{
49-
Task<HttpResponse> task = Task.Run(() => GetMessageReportAsync(msgIdList));
49+
Task<HttpResponse> task = GetMessageReportAsync(msgIdList);
5050
task.Wait();
5151
return task.Result;
5252
}
@@ -88,7 +88,7 @@ public async Task<HttpResponse> GetMessageSendStatusAsync(string msgId, List<str
8888
/// <param name="data">待查询日期，格式为 yyyy-MM-dd。如果传 null，则默认为当天。</param>
8989
public HttpResponse GetMessageSendStatus(string msgId, List<string> registrationIdList, string data)
9090
{
91-
Task<HttpResponse> task = Task.Run(() => GetMessageSendStatusAsync(msgId, registrationIdList, data));
91+
Task<HttpResponse> task = GetMessageSendStatusAsync(msgId, registrationIdList, data);
9292
task.Wait();
9393
return task.Result;
9494
}
@@ -114,7 +114,7 @@ public async Task<HttpResponse> GetMessageDetailReportAsync(List<string> msgIdLi
114114
/// <param name="msgIdList">消息的 msg_id 列表，每次最多支持 100 个。</param>
115115
public HttpResponse GetMessageDetailReport(List<string> msgIdList)
116116
{
117-
Task<HttpResponse> task = Task.Run(() => GetMessageDetailReportAsync(msgIdList));
117+
Task<HttpResponse> task = GetMessageDetailReportAsync(msgIdList);
118118
task.Wait();
119119
return task.Result;
120120
}
@@ -157,7 +157,7 @@ public async Task<HttpResponse> GetUserReportAsync(string timeUnit, string start
157157
/// </param>
158158
public HttpResponse GetUserReport(string timeUnit, string startTime, int duration)
159159
{
160-
Task<HttpResponse> task = Task.Run(() => GetUserReportAsync(timeUnit, startTime, duration));
160+
Task<HttpResponse> task = GetUserReportAsync(timeUnit, startTime, duration);
161161
task.Wait();
162162
return task.Result;
163163
}

‎Jiguang.JPush/ScheduleClient.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public async Task<HttpResponse> CreateSingleScheduleTaskAsync(string name, PushP
8686
/// <param name="trigger">触发器</param>
8787
public HttpResponse CreateSingleScheduleTask(string name, PushPayload pushPayload, string triggeringTime)
8888
{
89-
Task<HttpResponse> task = Task.Run(() => CreateSingleScheduleTaskAsync(name, pushPayload, triggeringTime));
89+
Task<HttpResponse> task = CreateSingleScheduleTaskAsync(name, pushPayload, triggeringTime);
9090
task.Wait();
9191
return task.Result;
9292
}
@@ -128,7 +128,7 @@ public async Task<HttpResponse> CreatePeriodicalScheduleTaskAsync(string name, P
128128
/// <param name="trigger">触发器</param>
129129
public HttpResponse CreatePeriodicalScheduleTask(string name, PushPayload pushPayload, Trigger trigger)
130130
{
131-
Task<HttpResponse> task = Task.Run(() => CreatePeriodicalScheduleTaskAsync(name, pushPayload, trigger));
131+
Task<HttpResponse> task = CreatePeriodicalScheduleTaskAsync(name, pushPayload, trigger);
132132
task.Wait();
133133
return task.Result;
134134
}
@@ -158,7 +158,7 @@ public async Task<HttpResponse> GetValidScheduleTasksAsync(int page = 1)
158158
/// </param>
159159
public HttpResponse GetValidScheduleTasks(int page = 1)
160160
{
161-
Task<HttpResponse> task = Task.Run(() => GetValidScheduleTasksAsync(page));
161+
Task<HttpResponse> task = GetValidScheduleTasksAsync(page);
162162
task.Wait();
163163
return task.Result;
164164
}
@@ -183,7 +183,7 @@ public async Task<HttpResponse> GetScheduleTaskAsync(string scheduleId)
183183
/// <param name="scheduleId">定时任务 ID。在创建定时任务时会返回。</param>
184184
public HttpResponse GetScheduleTask(string scheduleId)
185185
{
186-
Task<HttpResponse> task = Task.Run(() => GetScheduleTaskAsync(scheduleId));
186+
Task<HttpResponse> task = GetScheduleTaskAsync(scheduleId);
187187
task.Wait();
188188
return task.Result;
189189
}
@@ -249,7 +249,7 @@ public async Task<HttpResponse> UpdateSingleScheduleTaskAsync(string scheduleId,
249249
/// <param name="pushPayload">推送内容，为 null 表示不更新。</param>
250250
public HttpResponse UpdateSingleScheduleTask(string scheduleId, string name, bool? enabled, string triggeringTime, PushPayload pushPayload)
251251
{
252-
Task<HttpResponse> task = Task.Run(() => UpdateSingleScheduleTaskAsync(scheduleId, name, enabled, triggeringTime, pushPayload));
252+
Task<HttpResponse> task = UpdateSingleScheduleTaskAsync(scheduleId, name, enabled, triggeringTime, pushPayload);
253253
task.Wait();
254254
return task.Result;
255255
}
@@ -298,7 +298,7 @@ public async Task<HttpResponse> UpdatePeriodicalScheduleTaskAsync(string schedul
298298
/// <param name="pushPayload">推送内容，为 null 表示不更新。</param>
299299
public HttpResponse UpdatePeriodicalScheduleTask(string scheduleId, string name, bool? enabled, Trigger trigger, PushPayload pushPayload)
300300
{
301-
Task<HttpResponse> task = Task.Run(() => UpdatePeriodicalScheduleTaskAsync(scheduleId, name, enabled, trigger, pushPayload));
301+
Task<HttpResponse> task = UpdatePeriodicalScheduleTaskAsync(scheduleId, name, enabled, trigger, pushPayload);
302302
task.Wait();
303303
return task.Result;
304304
}
@@ -324,7 +324,7 @@ public async Task<HttpResponse> DeleteScheduleTaskAsync(string scheduleId)
324324
/// <param name="scheduleId">已创建的 schedule 任务的 id。如果 scheduleId 不合法，即不是有效的 uuid，则返回 404。</param>
325325
public HttpResponse DeleteScheduleTask(string scheduleId)
326326
{
327-
Task<HttpResponse> task = Task.Run(() => DeleteScheduleTaskAsync(scheduleId));
327+
Task<HttpResponse> task = DeleteScheduleTaskAsync(scheduleId);
328328
task.Wait();
329329
return task.Result;
330330
}

0 commit comments

Comments
 (0)