|
|
@@ -14,13 +14,8 @@ namespace MySystem
|
|
|
{
|
|
|
public class AliyunPush
|
|
|
{
|
|
|
-<<<<<<< HEAD
|
|
|
private string AccessKeyID = "LTAI5t7ivibdYZTro4SRVZ9M";
|
|
|
private string AccessKeySecret = "nfr1bmbJbMhLuaj10iBORkuFfIAX7M";
|
|
|
-=======
|
|
|
- private string AccessKeyID = " LTAI5tE9LtmJSzz7XA2p8aB1";//
|
|
|
- private string AccessKeySecret = "3AOlKu5WvcZrqSg9i0rSRbXStiCU04";//
|
|
|
->>>>>>> DuGuYang
|
|
|
|
|
|
public void PushMessageToAndroid()
|
|
|
{
|
|
|
@@ -163,11 +158,7 @@ namespace MySystem
|
|
|
}
|
|
|
else if (DeviceType == "iOS")
|
|
|
{
|
|
|
-<<<<<<< HEAD
|
|
|
request.AppKey = 27724645;
|
|
|
-=======
|
|
|
- request.AppKey = 27724645;//
|
|
|
->>>>>>> DuGuYang
|
|
|
}
|
|
|
if (string.IsNullOrEmpty(DeviceList))
|
|
|
{
|
