Skip to content

Commit d8699e5

Browse files
TommyLemonTommyLemon
committed
Client:与Server同步公共代码；解决删除评论崩溃
1 parent 58f8315 commit d8699e5

File tree

5 files changed

+35
-32
lines changed

5 files changed

+35
-32
lines changed

‎APIJSON-Android/APIJSON-ADT/APIJSONApp/APIJSONApp/src/apijson/demo/client/activity_fragment/MomentActivity.java‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,23 @@
1414

1515
package apijson.demo.client.activity_fragment;
1616

17+
import java.util.List;
18+
19+
import zuo.biao.apijson.JSONResponse;
20+
import zuo.biao.library.base.BaseHttpListActivity;
21+
import zuo.biao.library.base.BaseView.OnDataChangedListener;
22+
import zuo.biao.library.interfaces.AdapterCallBack;
23+
import zuo.biao.library.interfaces.CacheCallBack;
24+
import zuo.biao.library.interfaces.OnBottomDragListener;
25+
import zuo.biao.library.manager.CacheManager;
26+
import zuo.biao.library.manager.HttpManager.OnHttpResponseListener;
27+
import zuo.biao.library.ui.AlertDialog;
28+
import zuo.biao.library.ui.AlertDialog.OnDialogButtonClickListener;
29+
import zuo.biao.library.util.CommonUtil;
30+
import zuo.biao.library.util.EditTextUtil;
31+
import zuo.biao.library.util.Log;
32+
import zuo.biao.library.util.SettingUtil;
33+
import zuo.biao.library.util.StringUtil;
1734
import android.app.Activity;
1835
import android.content.Context;
1936
import android.content.Intent;
@@ -25,9 +42,6 @@
2542
import android.widget.AdapterView.OnItemClickListener;
2643
import android.widget.AdapterView.OnItemLongClickListener;
2744
import android.widget.EditText;
28-
29-
import java.util.List;
30-
3145
import apijson.demo.client.R;
3246
import apijson.demo.client.adapter.CommentAdapter;
3347
import apijson.demo.client.application.APIJSONApplication;
@@ -40,22 +54,7 @@
4054
import apijson.demo.client.util.HttpRequest;
4155
import apijson.demo.client.view.CommentView.OnCommentClickListener;
4256
import apijson.demo.client.view.MomentView;
43-
import zuo.biao.apijson.JSON;
44-
import zuo.biao.apijson.JSONResponse;
45-
import zuo.biao.library.base.BaseHttpListActivity;
46-
import zuo.biao.library.base.BaseView.OnDataChangedListener;
47-
import zuo.biao.library.interfaces.AdapterCallBack;
48-
import zuo.biao.library.interfaces.CacheCallBack;
49-
import zuo.biao.library.interfaces.OnBottomDragListener;
50-
import zuo.biao.library.manager.CacheManager;
51-
import zuo.biao.library.manager.HttpManager.OnHttpResponseListener;
52-
import zuo.biao.library.ui.AlertDialog;
53-
import zuo.biao.library.ui.AlertDialog.OnDialogButtonClickListener;
54-
import zuo.biao.library.util.CommonUtil;
55-
import zuo.biao.library.util.EditTextUtil;
56-
import zuo.biao.library.util.Log;
57-
import zuo.biao.library.util.SettingUtil;
58-
import zuo.biao.library.util.StringUtil;
57+
import apijson.demo.server.model.BaseModel;
5958

6059
/**用户列表界面fragment
6160
* @author Lemon
@@ -351,7 +350,7 @@ private void deleteComment(CommentItem commentItem) {
351350
Log.e(TAG, "deleteComment id <= 0 >> return;");
352351
return;
353352
}
354-
HttpRequest.deleteComment(id, HTTP_DELETE, this);
353+
HttpRequest.deleteComment(id, BaseModel.value(commentItem.getUserId()), HTTP_DELETE, this);
355354
}
356355

357356

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import apijson.demo.client.manager.HttpManager;
3030
import apijson.demo.client.model.CommentItem;
3131
import apijson.demo.server.model.Comment;
32-
import apijson.demo.server.model.Login;
3332
import apijson.demo.server.model.Moment;
3433
import apijson.demo.server.model.Privacy;
3534
import apijson.demo.server.model.User;
@@ -633,14 +632,15 @@ public static void addComment(long momentId, long toCommentId, long toUserId, St
633632
}
634633
/**
635634
* @param id
635+
* @param userId
636636
* @param requestCode
637637
* @param listener
638638
*/
639-
public static void deleteComment(long id, int requestCode, OnHttpResponseListener listener) {
639+
public static void deleteComment(long id, long userId, int requestCode, OnHttpResponseListener listener) {
640640
delete(new JSONRequest(
641-
new JSONObject(
641+
COMMENT_, new JSONObject(
642642
new Comment(id)
643-
).setRole(application.isCurrentUser(id) ? RequestRole.OWNER.name() : RequestRole.ADMIN.name())
643+
).setRole(application.isCurrentUser(userId) ? RequestRole.OWNER.name() : RequestRole.ADMIN.name())
644644
).setTag(COMMENT_)
645645
, requestCode, listener);
646646
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -306,14 +306,14 @@ public JSONObject putsSearch(String key, String value, int type) {
306306
* @param object
307307
* @return this
308308
*/
309-
public JSONObject putsAll(com.alibaba.fastjson.JSONObject object) {
310-
putAll(object);
309+
public JSONObject putsAll(Map<? extends String, ? extends Object> map) {
310+
putAll(map);
311311
return this;
312312
}
313313
@Override
314-
public void putAll(Map<? extends String, ? extends Object> m) {
315-
if (m != null && m.isEmpty() == false) {
316-
super.putAll(m);
314+
public void putAll(Map<? extends String, ? extends Object> map) {
315+
if (map != null && map.isEmpty() == false) {
316+
super.putAll(map);
317317
}
318318
}
319319

‎APIJSON-Android/APIJSON-ADT/APIJSONLibrary/src/zuo/biao/apijson/JSONRequest.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414

1515
package zuo.biao.apijson;
1616

17+
import java.util.Map;
18+
1719
/**wrapper for request
1820
* @author Lemon
1921
* @see #puts
@@ -117,7 +119,11 @@ public JSONRequest toArray(int count, int page, String name) {
117119
}
118120

119121

120-
122+
@Override
123+
public JSONObject putsAll(Map<? extends String, ? extends Object> map) {
124+
super.putsAll(map);
125+
return this;
126+
}
121127

122128
@Override
123129
public JSONRequest puts(Object value) {

‎APIJSON-Java-Server/APIJSON-Eclipse/src/main/java/apijson/demo/server/Controller.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,11 @@
2222
import static zuo.biao.apijson.RequestMethod.POST_HEAD;
2323
import static zuo.biao.apijson.RequestMethod.PUT;
2424

25-
import java.net.URLDecoder;
2625
import java.util.Random;
2726
import java.util.concurrent.TimeoutException;
2827

2928
import javax.servlet.http.HttpSession;
3029

31-
import org.springframework.web.bind.annotation.PathVariable;
3230
import org.springframework.web.bind.annotation.RequestBody;
3331
import org.springframework.web.bind.annotation.RequestMapping;
3432
import org.springframework.web.bind.annotation.RestController;

0 commit comments

Comments
 (0)