Skip to content

Commit 39fe3eb

Browse files
committed
update device api example
1 parent 881e641 commit 39fe3eb

File tree

2 files changed

+37
-15
lines changed

2 files changed

+37
-15
lines changed

examples/DeviceExample.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ function printAPIConnectionErrorStack($e) {
5252

5353
/*----Devices Example----*/
5454
try {
55+
//获取当前用户的所有属性,包含tags, alias。
5556
$result = $client->getDeviceTagAlias($REGISTRATION_ID1);
5657
$payload = $result->body;
5758
echo '<b>getDeviceTagAlias</b>' . $br;
@@ -65,6 +66,7 @@ function printAPIConnectionErrorStack($e) {
6566
}
6667

6768
try {
69+
//移除指定RegistrationId的所有alias
6870
$result = $client->removeDeviceAlias($REGISTRATION_ID1);
6971
echo '<b>removeDeviceAlias</b>' . $br;
7072
if ($result->isOk) {
@@ -81,6 +83,7 @@ function printAPIConnectionErrorStack($e) {
8183

8284

8385
try {
86+
//移除指定RegistrationId的所有tag
8487
$result = $client->removeDeviceTag($REGISTRATION_ID1);
8588
echo '<b>removeDeviceTag</b>' . $br;
8689
if ($result->isOk) {
@@ -97,6 +100,7 @@ function printAPIConnectionErrorStack($e) {
97100

98101

99102
try {
103+
//更新指定RegistrationId的指定属性,当前支持tags, alias
100104
$result = $client->updateDeviceTagAlias($REGISTRATION_ID1, $ALIAS1, array($TAG1, $TAG2), array($TAG3));
101105
echo '<b>updateTagDevices</b>' . $br;
102106
if ($result->isOk) {
@@ -114,6 +118,7 @@ function printAPIConnectionErrorStack($e) {
114118

115119
/*----Tags Example----*/
116120
try {
121+
//获取当前应用的所有标签列表
117122
$result = $client->getTags();
118123
$payload = $result->body;
119124
echo '<b>getTags</b>' . $br;
@@ -126,6 +131,7 @@ function printAPIConnectionErrorStack($e) {
126131
}
127132

128133
try {
134+
//查询某个用户是否在tag下
129135
$result = $client->isDeviceInTag($REGISTRATION_ID1, $TAG1);
130136
$payload = $result->body;
131137
echo '<b>isDeviceInTag</b>' . $br;
@@ -138,6 +144,7 @@ function printAPIConnectionErrorStack($e) {
138144
}
139145

140146
try {
147+
//对指定tag添加或者删除registrationId
141148
$result = $client->updateTagDevices($TAG1, array($REGISTRATION_ID1), array($REGISTRATION_ID2));
142149
echo '<b>updateTagDevices</b>' . $br;
143150
if ($result->isOk) {
@@ -153,6 +160,7 @@ function printAPIConnectionErrorStack($e) {
153160
}
154161

155162
try {
163+
//删除指定Tag,以及与其关联的用户之间的关联关系
156164
$result = $client->deleteTag($TAG2);
157165
echo '<b>deleteTag</b>' . $br;
158166
if ($result->isOk) {
@@ -169,6 +177,7 @@ function printAPIConnectionErrorStack($e) {
169177

170178
/*----Alias Example----*/
171179
try {
180+
//删除指定alias,以及该alias与用户的绑定关系
172181
$result = $client->getAliasDevices($ALIAS1, array('ios', 'android'));
173182
$payload = $result->body;
174183
echo '<b>getAliasDevices</b>' . $br;

src/JPush/JPushClient.php

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ public function users($time_unit, $start, $duration) {
8888

8989
/*----Device API start----*/
9090
/**
91-
* 获取当前用户的所有属性,包含tags, alias。
91+
* 获取指定RegistrationId的所有属性,包含tags, alias。
9292
* @param $registrationId
93-
* @return \Httpful\associative|null|string
93+
* @return DeviceResponse
9494
*/
9595
public function getDeviceTagAlias($registrationId) {
9696
$header = array('User-Agent' => self::USER_AGENT,
@@ -102,7 +102,12 @@ public function getDeviceTagAlias($registrationId) {
102102
return new DeviceResponse($response);
103103
}
104104

105-
105+
/**
106+
* 移除指定RegistrationId的所有tag
107+
* @param $registrationId
108+
* @return DeviceResponse
109+
* @throws \InvalidArgumentException
110+
*/
106111
public function removeDeviceTag($registrationId) {
107112
if (is_null($registrationId) || !is_string($registrationId)) {
108113
throw new InvalidArgumentException("Invalid registrationId string");
@@ -117,6 +122,12 @@ public function removeDeviceTag($registrationId) {
117122
return new DeviceResponse($response);
118123
}
119124

125+
/**
126+
* 移除指定RegistrationId的所有alias
127+
* @param $registrationId
128+
* @return DeviceResponse
129+
* @throws \InvalidArgumentException
130+
*/
120131
public function removeDeviceAlias($registrationId) {
121132
if (is_null($registrationId) || !is_string($registrationId)) {
122133
throw new InvalidArgumentException("Invalid registrationId string");
@@ -132,12 +143,12 @@ public function removeDeviceAlias($registrationId) {
132143
}
133144

134145
/**
135-
* 更新当前用户的指定属性,当前支持tags, alias
146+
* 更新指定RegistrationId的指定属性,当前支持tags, alias
136147
* @param $registrationId
137-
* @param $alias
138-
* @param $addTags
139-
* @param $removeTags
140-
* @return \Httpful\associative|null|string
148+
* @param null $alias
149+
* @param null $addTags
150+
* @param null $removeTags
151+
* @return DeviceResponse
141152
* @throws \InvalidArgumentException
142153
*/
143154
public function updateDeviceTagAlias($registrationId, $alias = null, $addTags = null, $removeTags = null) {
@@ -196,7 +207,7 @@ public function updateDeviceTagAlias($registrationId, $alias = null, $addTags =
196207

197208
/**
198209
* 获取当前应用的所有标签列表
199-
* @return \Httpful\associative|null|string
210+
* @return DeviceResponse
200211
*/
201212
public function getTags() {
202213
$header = array('User-Agent' => self::USER_AGENT,
@@ -211,7 +222,7 @@ public function getTags() {
211222
* 查询某个用户是否在tag下
212223
* @param $registrationId
213224
* @param $tag
214-
* @return \Httpful\associative|null|string
225+
* @return DeviceResponse
215226
* @throws \InvalidArgumentException
216227
*/
217228
public function isDeviceInTag($registrationId, $tag) {
@@ -235,7 +246,7 @@ public function isDeviceInTag($registrationId, $tag) {
235246
}
236247

237248
/**
238-
* 为一个标签添加或者删除用户
249+
* 对指定tag添加或者删除registrationId
239250
* @param $tag
240251
* @param null $addDevices
241252
* @param null $removeDevices
@@ -283,8 +294,10 @@ public function updateTagDevices($tag, $addDevices = null, $removeDevices = null
283294
}
284295

285296
/**
286-
* 删除一个标签,以及标签与用户之间的关联关系
297+
* 删除指定Tag,以及与其关联的用户之间的关联关系
287298
* @param $tag
299+
* @return DeviceResponse
300+
* @throws \InvalidArgumentException
288301
*/
289302
public function deleteTag($tag) {
290303
if (is_null($tag) || !is_string($tag)) {
@@ -304,7 +317,7 @@ public function deleteTag($tag) {
304317
* 获取指定alias下的用户,最多输出10个
305318
* @param $alias
306319
* @param null $platform
307-
* @return \Httpful\associative|null|string
320+
* @return DeviceResponse
308321
* @throws \InvalidArgumentException
309322
*/
310323
public function getAliasDevices($alias, $platform = null) {
@@ -339,9 +352,9 @@ public function getAliasDevices($alias, $platform = null) {
339352
}
340353

341354
/**
342-
* 删除一个别名,以及该别名与用户的绑定关系
355+
* 删除指定alias,以及该alias与用户的绑定关系
343356
* @param $alias
344-
* @return \Httpful\associative|null|string
357+
* @return DeviceResponse
345358
* @throws \InvalidArgumentException
346359
*/
347360
public function deleteAlias($alias) {

0 commit comments

Comments
 (0)