Skip to content

Commit c2e5845

Browse files
TommyLemonTommyLemon
committed
Client:HttpRequest所有请求total的测试都通过；优化HttpRequest关于Model名的代码
1 parent 289b506 commit c2e5845

File tree

3 files changed

+54
-39
lines changed

3 files changed

+54
-39
lines changed

‎APIJSON(Android)/APIJSON(ADT)/APIJSONApp/APIJSONApp/src/apijson/demo/client/util/HttpRequest.java‎

Lines changed: 50 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,21 @@ public static void delete(JSONObject request, int requestCode, OnHttpResponseLis
121121

122122

123123

124-
//示例代码<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
124+
125+
126+
127+
128+
129+
130+
131+
public static final String USER;
132+
public static final String MOMENT;
133+
public static final String COMMENT;
134+
static {
135+
USER = User.class.getSimpleName();
136+
MOMENT = Moment.class.getSimpleName();
137+
COMMENT = Comment.class.getSimpleName();
138+
}
125139

126140

127141
//user<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
@@ -184,7 +198,7 @@ public static void delete(JSONObject request, int requestCode, OnHttpResponseLis
184198
public static void register(String verify, String phone, String password, String name, int sex
185199
, int requestCode, OnHttpResponseListener listener) {
186200
JSONObject request = new JSONRequest(new User().setPhone(phone).setName(name).setSex(sex))
187-
.setTag(User.class.getSimpleName());
201+
.setTag(USER);
188202
request.put(VERIFY, verify);
189203
request.put(PASSWORD, password);
190204
HttpManager.getInstance().post(URL_POST + "register/user/", request, requestCode, listener);
@@ -266,9 +280,9 @@ public static void getUser(long id, int requestCode, OnHttpResponseListener list
266280
public static void getUser(long id, boolean withMomentList, int requestCode, OnHttpResponseListener listener) {
267281
JSONRequest request = new JSONRequest(new User(id));
268282
if (withMomentList) {
269-
request.add(new JSONRequest(Moment.class.getSimpleName()
283+
request.add(new JSONRequest(MOMENT
270284
, new JSONRequest(USER_ID, id).setColumn("pictureList").setOrder(DATE_DOWN))
271-
.toArray(3, 0, Moment.class.getSimpleName()));
285+
.toArray(3, 0, MOMENT));
272286
}
273287
get(request, requestCode, listener);
274288
}
@@ -283,8 +297,7 @@ public static void setIsFriend(long id, boolean isFriend, int requestCode, OnHtt
283297
list.add(id);
284298
JSONObject userObject = new JSONObject(new User(user.getId()));
285299
userObject.put("friendIdList" + (isFriend ? "+" : "-"), list, true);
286-
put(new JSONRequest(User.class.getSimpleName(), userObject).setTag(User.class.getSimpleName())
287-
, requestCode, listener);
300+
put(new JSONRequest(USER, userObject).setTag(USER), requestCode, listener);
288301
}
289302

290303
public static final int RANGE_ALL = 0;
@@ -345,13 +358,13 @@ public static void getUserList(int range, long id, com.alibaba.fastjson.JSONObje
345358
case RANGE_MOMENT:
346359
JSONObject moment = new JSONObject(new Moment(id));
347360
moment.setColumn("praiseUserIdList");
348-
request.put(Moment.class.getSimpleName(), moment);
361+
request.put(MOMENT, moment);
349362
userItem.put(ID_IN+"@", "Moment/praiseUserIdList");
350363
break;
351364
case RANGE_COMMENT:
352365
JSONObject comment = new JSONObject(new Comment(id));
353366
comment.setColumn(USER_ID);
354-
request.put(Comment.class.getSimpleName(), comment);
367+
request.put(COMMENT, comment);
355368
userItem.put(ID_AT, "Comment/userId");
356369
break;
357370
default:
@@ -360,8 +373,8 @@ public static void getUserList(int range, long id, com.alibaba.fastjson.JSONObje
360373
userItem.add(search);
361374
}
362375

363-
JSONRequest listRequest = new JSONRequest(User.class.getSimpleName(), userItem);
364-
listRequest = listRequest.toArray(count, page, User.class.getSimpleName());
376+
JSONRequest listRequest = new JSONRequest(USER, userItem);
377+
listRequest = listRequest.toArray(count, page, USER);
365378
request.add(listRequest);
366379
get(request, requestCode, listener);
367380
}
@@ -380,15 +393,15 @@ public static void getUserList(int range, long id, com.alibaba.fastjson.JSONObje
380393
*/
381394
public static void getMoment(long id, int requestCode, OnHttpResponseListener listener) {
382395
JSONRequest request = new JSONRequest(new Moment(id));
383-
request.put(User.class.getSimpleName(), new JSONRequest(ID_AT, "/Moment/userId"));
396+
request.put(USER, new JSONRequest(ID_AT, "/Moment/userId").setColumn(COLUMNS_USER));
384397
//praise <<<<<<<<<<<<<<<<<<
385398
JSONRequest userItem = new JSONRequest();
386-
userItem.put(User.class.getSimpleName(), new JSONRequest(ID_IN+"@", "Moment/praiseUserIdList")
399+
userItem.put(USER, new JSONRequest(ID_IN+"@", "Moment/praiseUserIdList")
387400
.setColumn(COLUMNS_USER_SIMPLE));
388401

389-
// userItem.setQuery(JSONRequest.QUERY_ALL);
390-
request.add(userItem.toArray(10, 0, User.class.getSimpleName()));
391-
// request.putPath("praiseCount", "/User[]", TOTAL);
402+
userItem.setQuery(JSONRequest.QUERY_ALL);
403+
request.add(userItem.toArray(10, 0, USER));
404+
request.put("praiseCount@", "/User[]/total");
392405
//praise >>>>>>>>>>>>>>>>>>
393406

394407
get(request, requestCode, listener);
@@ -443,28 +456,28 @@ public static void getMomentList(int range, long id, com.alibaba.fastjson.JSONOb
443456
moment.setOrder(DATE_DOWN);
444457
moment.add(search);
445458

446-
request.put(Moment.class.getSimpleName(), moment);
447-
request.put(User.class.getSimpleName(), new JSONRequest(ID_AT, "/Moment/userId").setColumn(COLUMNS_USER));
459+
request.put(MOMENT, moment);
460+
request.put(USER, new JSONRequest(ID_AT, "/Moment/userId").setColumn(COLUMNS_USER));
448461

449462
//praise <<<<<<<<<<<<<<<<<<
450463
JSONRequest userItem = new JSONRequest();
451-
userItem.put(User.class.getSimpleName(), new JSONRequest(ID_IN+"@", "[]/Moment/praiseUserIdList")
464+
userItem.put(USER, new JSONRequest(ID_IN+"@", "[]/Moment/praiseUserIdList")
452465
.setColumn(COLUMNS_USER_SIMPLE));
453466

454-
// userItem.setQuery(JSONRequest.QUERY_TOTAL);
455-
request.add(userItem.toArray(10, 0, User.class.getSimpleName()));
456-
// request.putPath("praiseCount", "/User[]", TOTAL);
467+
userItem.setQuery(JSONRequest.QUERY_ALL);
468+
request.add(userItem.toArray(10, 0, USER));
469+
request.put("praiseCount@", "/User[]/total");
457470
//praise >>>>>>>>>>>>>>>>>>
458471

459472
//comment <<<<<<<<<<<<<<<<<<
460473
JSONRequest commentItem = new JSONRequest();
461-
commentItem.put(Comment.class.getSimpleName(), new JSONRequest(MOMENT_ID_AT, "[]/Moment/id").setOrder(DATE_UP));
462-
commentItem.put(User.class.getSimpleName(), new JSONRequest(ID_AT, "/Comment/userId")
474+
commentItem.put(COMMENT, new JSONRequest(MOMENT_ID_AT, "[]/Moment/id").setOrder(DATE_UP));
475+
commentItem.put(USER, new JSONRequest(ID_AT, "/Comment/userId")
463476
.setColumn(COLUMNS_USER_SIMPLE));
464477

465-
// commentItem.setQuery(JSONRequest.QUERY_ALL);
478+
commentItem.setQuery(JSONRequest.QUERY_ALL);
466479
request.add(commentItem.toArray(6, 0, CommentItem.class.getSimpleName()));
467-
// request.putPath("commentCount", "/CommentItem[]", TOTAL);
480+
request.put("commentCount@", "/CommentItem[]/total");
468481
//comment >>>>>>>>>>>>>>>>>>
469482

470483
get(request.toArray(count, page), requestCode, listener);
@@ -481,8 +494,7 @@ public static void praiseMoment(long id, boolean toPraise, int requestCode, OnHt
481494
List<Long> list = new ArrayList<Long>();
482495
list.add(APIJSONApplication.getInstance().getCurrentUserId());
483496
data.put("praiseUserIdList" + (toPraise ? "+" : "-"), list, true);
484-
put(new JSONRequest(Moment.class.getSimpleName(), data).setTag(Moment.class.getSimpleName())
485-
, requestCode, listener);
497+
put(new JSONRequest(MOMENT, data).setTag(MOMENT), requestCode, listener);
486498
}
487499

488500
/**删除动态
@@ -491,7 +503,7 @@ public static void praiseMoment(long id, boolean toPraise, int requestCode, OnHt
491503
* @param listener
492504
*/
493505
public static void deleteMoment(Long id, int requestCode, OnHttpResponseListener listener) {
494-
delete(new JSONRequest(new Moment(id)).setTag(Moment.class.getSimpleName()), requestCode, listener);
506+
delete(new JSONRequest(new Moment(id)).setTag(MOMENT), requestCode, listener);
495507
}
496508

497509
//Moment>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -512,16 +524,16 @@ public static void getCommentList(long momentId, int count, int page
512524
, int requestCode, OnHttpResponseListener listener) {
513525
JSONRequest request = new JSONRequest();
514526
JSONObject comment = new JSONObject(new Comment().setMomentId(momentId));
515-
request.put(Comment.class.getSimpleName(), comment.setOrder(DATE_UP));
516-
request.put(User.class.getSimpleName(), new JSONRequest(ID_AT, "/Comment/userId").setColumn(COLUMNS_USER));
527+
request.put(COMMENT, comment.setOrder(DATE_UP));
528+
request.put(USER, new JSONRequest(ID_AT, "/Comment/userId").setColumn(COLUMNS_USER));
517529

518-
// if (page == 0) {
519-
// request.setQuery(JSONRequest.QUERY_ALL);
520-
// }
530+
if (page == 0) {
531+
request.setQuery(JSONRequest.QUERY_ALL);
532+
}
521533
request = request.toArray(count, page);
522-
// if (page == 0) {
523-
// request.putPath(TOTAL, "[]", TOTAL);
524-
// }
534+
if (page == 0) {
535+
request.putPath(TOTAL, "[]", TOTAL);
536+
}
525537

526538
get(request, requestCode, listener);
527539
}
@@ -541,15 +553,15 @@ public static void addComment(long momentId, long toCommentId, long toUserId, St
541553
.setUserId(application.getCurrentUserId())
542554
.setMomentId(momentId)
543555
.setContent(content);
544-
post(new JSONRequest(comment).setTag(Comment.class.getSimpleName()), requestCode, listener);
556+
post(new JSONRequest(comment).setTag(COMMENT), requestCode, listener);
545557
}
546558
/**
547559
* @param id
548560
* @param requestCode
549561
* @param listener
550562
*/
551563
public static void deleteComment(long id, int requestCode, OnHttpResponseListener listener) {
552-
delete(new JSONRequest(new Comment(id)).setTag(Comment.class.getSimpleName()), requestCode, listener);
564+
delete(new JSONRequest(new Comment(id)).setTag(COMMENT), requestCode, listener);
553565
}
554566

555567
//Comment>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

‎APIJSON(Android)/APIJSON(ADT)/APIJSONApp/APIJSONApp/src/apijson/demo/client/view/MomentView.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,8 @@ public void bindView(MomentItem data_){
188188
tvMomentViewContent.setVisibility(StringUtil.isNotEmpty(moment.getContent(), true) ? View.VISIBLE : View.GONE);
189189
tvMomentViewContent.setText(StringUtil.getTrimedString(moment.getContent()));
190190

191-
tvMomentViewDate.setText(TimeUtil.getSmartDate(moment.getDate()));
191+
tvMomentViewDate.setText(TimeUtil.getSmartDate(moment.getDate())
192+
+ " P:" + data.getPraiseCount() + " C:" + data.getCommentCount());
192193

193194
// 图片
194195
setPicture(moment.getPictureList());

‎APIJSON(Android)/APIJSON(ADT)/APIJSONLibrary/src/zuo/biao/apijson/JSONObject.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ public JSONObject add(com.alibaba.fastjson.JSONObject object) {
102102
* @return this
103103
*/
104104
public JSONObject add(com.alibaba.fastjson.JSONObject object, boolean encode) {
105+
//TODO putAll(object);
106+
105107
Set<String> set = object == null ? null : object.keySet();
106108
if (set != null) {
107109
for (String key : set) {

0 commit comments

Comments
 (0)