Commit d8699e5
committed
Client:与Server同步公共代码；解决删除评论崩溃
1 parent 58f8315 commit d8699e5
5 files changed
Lines changed: 35 additions & 32 deletions
File tree
- APIJSON-Android/APIJSON-ADT
- APIJSONApp/APIJSONApp/src/apijson/demo/client
- activity_fragment
- util
- APIJSONLibrary/src/zuo/biao/apijson
- APIJSON-Java-Server/APIJSON-Eclipse/src/main/java/apijson/demo/server
Lines changed: 19 additions & 20 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -14,6 +14,23 @@ | |||
| 14 | 14 | ||
| 15 | 15 | package apijson.demo.client.activity_fragment; | |
| 16 | 16 | ||
| 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; | ||
| 17 | 34 | import android.app.Activity; | |
| 18 | 35 | import android.content.Context; | |
| 19 | 36 | import android.content.Intent; | |
@@ -25,9 +42,6 @@ | |||
| 25 | 42 | import android.widget.AdapterView.OnItemClickListener; | |
| 26 | 43 | import android.widget.AdapterView.OnItemLongClickListener; | |
| 27 | 44 | import android.widget.EditText; | |
| 28 | - | ||
| 29 | - import java.util.List; | ||
| 30 | - | ||
| 31 | 45 | import apijson.demo.client.R; | |
| 32 | 46 | import apijson.demo.client.adapter.CommentAdapter; | |
| 33 | 47 | import apijson.demo.client.application.APIJSONApplication; | |
@@ -40,22 +54,7 @@ | |||
| 40 | 54 | import apijson.demo.client.util.HttpRequest; | |
| 41 | 55 | import apijson.demo.client.view.CommentView.OnCommentClickListener; | |
| 42 | 56 | 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; | ||
| 59 | 58 | ||
| 60 | 59 | /**用户列表界面fragment | |
| 61 | 60 | * @author Lemon | |
@@ -351,7 +350,7 @@ private void deleteComment(CommentItem commentItem) { | |||
| 351 | 350 | Log.e(TAG, "deleteComment id <= 0 >> return;"); | |
| 352 | 351 | return; | |
| 353 | 352 | } | |
| 354 | - HttpRequest.deleteComment(id, HTTP_DELETE, this); | ||
| 353 | + HttpRequest.deleteComment(id, BaseModel.value(commentItem.getUserId()), HTTP_DELETE, this); | ||
| 355 | 354 | } | |
| 356 | 355 | ||
| 357 | 356 | ||
Lines changed: 4 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -29,7 +29,6 @@ | |||
| 29 | 29 | import apijson.demo.client.manager.HttpManager; | |
| 30 | 30 | import apijson.demo.client.model.CommentItem; | |
| 31 | 31 | import apijson.demo.server.model.Comment; | |
| 32 | - import apijson.demo.server.model.Login; | ||
| 33 | 32 | import apijson.demo.server.model.Moment; | |
| 34 | 33 | import apijson.demo.server.model.Privacy; | |
| 35 | 34 | import apijson.demo.server.model.User; | |
@@ -633,14 +632,15 @@ public static void addComment(long momentId, long toCommentId, long toUserId, St | |||
| 633 | 632 | } | |
| 634 | 633 | /** | |
| 635 | 634 | * @param id | |
| 635 | + * @param userId | ||
| 636 | 636 | * @param requestCode | |
| 637 | 637 | * @param listener | |
| 638 | 638 | */ | |
| 639 | - public static void deleteComment(long id, int requestCode, OnHttpResponseListener listener) { | ||
| 639 | + public static void deleteComment(long id, long userId, int requestCode, OnHttpResponseListener listener) { | ||
| 640 | 640 | delete(new JSONRequest( | |
| 641 | - new JSONObject( | ||
| 641 | + COMMENT_, new JSONObject( | ||
| 642 | 642 | 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()) | ||
| 644 | 644 | ).setTag(COMMENT_) | |
| 645 | 645 | , requestCode, listener); | |
| 646 | 646 | } | |
Lines changed: 5 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -306,14 +306,14 @@ public JSONObject putsSearch(String key, String value, int type) { | |||
| 306 | 306 | * @param object | |
| 307 | 307 | * @return this | |
| 308 | 308 | */ | |
| 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); | ||
| 311 | 311 | return this; | |
| 312 | 312 | } | |
| 313 | 313 | @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); | ||
| 317 | 317 | } | |
| 318 | 318 | } | |
| 319 | 319 | ||
Lines changed: 7 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -14,6 +14,8 @@ | |||
| 14 | 14 | ||
| 15 | 15 | package zuo.biao.apijson; | |
| 16 | 16 | ||
| 17 | + import java.util.Map; | ||
| 18 | + | ||
| 17 | 19 | /**wrapper for request | |
| 18 | 20 | * @author Lemon | |
| 19 | 21 | * @see #puts | |
@@ -117,7 +119,11 @@ public JSONRequest toArray(int count, int page, String name) { | |||
| 117 | 119 | } | |
| 118 | 120 | ||
| 119 | 121 | ||
| 120 | - | ||
| 122 | + @Override | ||
| 123 | + public JSONObject putsAll(Map<? extends String, ? extends Object> map) { | ||
| 124 | + super.putsAll(map); | ||
| 125 | + return this; | ||
| 126 | + } | ||
| 121 | 127 | ||
| 122 | 128 | @Override | |
| 123 | 129 | public JSONRequest puts(Object value) { | |
Lines changed: 0 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -22,13 +22,11 @@ | |||
| 22 | 22 | import static zuo.biao.apijson.RequestMethod.POST_HEAD; | |
| 23 | 23 | import static zuo.biao.apijson.RequestMethod.PUT; | |
| 24 | 24 | ||
| 25 | - import java.net.URLDecoder; | ||
| 26 | 25 | import java.util.Random; | |
| 27 | 26 | import java.util.concurrent.TimeoutException; | |
| 28 | 27 | ||
| 29 | 28 | import javax.servlet.http.HttpSession; | |
| 30 | 29 | ||
| 31 | - import org.springframework.web.bind.annotation.PathVariable; | ||
| 32 | 30 | import org.springframework.web.bind.annotation.RequestBody; | |
| 33 | 31 | import org.springframework.web.bind.annotation.RequestMapping; | |
| 34 | 32 | import org.springframework.web.bind.annotation.RestController; | |
0 commit comments