Merge branch 'v2-dev' into v2

jpush · Sep 18, 2017 · bf596a1 · bf596a1
2 parents abcbf19 + 7166568
commit bf596a1
Show file tree

Hide file tree

Showing 7 changed files with 836 additions and 565 deletions.
diff --git a/Example/Example.cs b/Example/Example.cs
@@ -49,7 +49,7 @@ private static void ExecutePushExample()
                     }
                 }
             };
-            var response = client.SendPushAsync(pushPayload).Result;
+            var response = client.SendPush(pushPayload);
             Console.WriteLine(response.Content);
         }
 
@@ -66,13 +66,13 @@ private static void ExecuteDeviceEample()
                     { "remove", new List<string>() { "tag3", "tag4" } }
                 }
             };
-            var response = client.Device.UpdateDeviceInfoAsync(registrationId, devicePayload).Result;
+            var response = client.Device.UpdateDeviceInfo(registrationId, devicePayload);
             Console.WriteLine(response.Content);
         }
 
         private static void ExecuteReportExample()
         {
-            var response = client.Report.GetMessageReportAsync(new List<string> { "1251231231" }).Result;
+            var response = client.Report.GetMessageReport(new List<string> { "1251231231" });
             Console.WriteLine(response.Content);
         }
 
@@ -98,7 +98,7 @@ private static void ExecuteScheduleExample()
                     "wed", "fri"
                 }
             };
-            var response = client.Schedule.CreatePeriodicalScheduleTaskAsync("task1", pushPayload, trigger).Result;
+            var response = client.Schedule.CreatePeriodicalScheduleTask("task1", pushPayload, trigger);
             Console.WriteLine(response.Content);
         }
     }

diff --git a/Jiguang.JPush.dll b/Jiguang.JPush.dll