Skip to content

Commit d3c6781

Browse files
TommyLemonTommyLemon
committed
Server:新增GET类方法可在[]中获取total；依赖获取失败处理；Client:优化model；优化注释；与adt版同步
1 parent c644cb7 commit d3c6781

15 files changed

Lines changed: 259 additions & 225 deletions

File tree

‎APIJSON(Android)/APIJSON(AndroidStudio)/APIJSONApp/app/src/main/java/apijson/demo/client/activity_fragment/MomentActivity.java‎

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

1515
package apijson.demo.client.activity_fragment;
1616

17-
import java.util.List;
18-
19-
import zuo.biao.apijson.JSON;
20-
import zuo.biao.apijson.JSONResponse;
21-
import zuo.biao.library.base.BaseHttpListActivity;
22-
import zuo.biao.library.base.BaseView.OnDataChangedListener;
23-
import zuo.biao.library.interfaces.AdapterCallBack;
24-
import zuo.biao.library.interfaces.CacheCallBack;
25-
import zuo.biao.library.interfaces.OnBottomDragListener;
26-
import zuo.biao.library.manager.CacheManager;
27-
import zuo.biao.library.manager.HttpManager.OnHttpResponseListener;
28-
import zuo.biao.library.ui.AlertDialog;
29-
import zuo.biao.library.ui.AlertDialog.OnDialogButtonClickListener;
30-
import zuo.biao.library.util.CommonUtil;
31-
import zuo.biao.library.util.EditTextUtil;
32-
import zuo.biao.library.util.Log;
33-
import zuo.biao.library.util.SettingUtil;
34-
import zuo.biao.library.util.StringUtil;
3517
import android.app.Activity;
3618
import android.content.Context;
3719
import android.content.Intent;
@@ -43,6 +25,9 @@
4325
import android.widget.AdapterView.OnItemClickListener;
4426
import android.widget.AdapterView.OnItemLongClickListener;
4527
import android.widget.EditText;
28+
29+
import java.util.List;
30+
4631
import apijson.demo.client.R;
4732
import apijson.demo.client.adapter.CommentAdapter;
4833
import apijson.demo.client.application.APIJSONApplication;
@@ -55,6 +40,22 @@
5540
import apijson.demo.client.util.HttpRequest;
5641
import apijson.demo.client.view.CommentItemView.OnCommentClickListener;
5742
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;
5859

5960
/**用户列表界面fragment
6061
* @author Lemon
@@ -501,13 +502,15 @@ public void onDialogButtonClick(int requestCode, boolean isPositive) {
501502
private final int HTTP_DELETE = 4;
502503
@Override
503504
public void onHttpResponse(int requestCode, String resultJson, Exception e) {
505+
JSONResponse response = new JSONResponse(resultJson);
504506
if (requestCode <= 0) {
505-
// showShortToast("total=" + response.getTotal());
507+
if (requestCode == 0 && momentItem != null) {
508+
setHead(momentItem.setCommentCount(response.getTotal()));
509+
}
506510
super.onHttpResponse(requestCode, resultJson, e);
507511
return;
508512
}
509513

510-
JSONResponse response = new JSONResponse(resultJson);
511514
if (requestCode == HTTP_GET_MOMENT) {
512515
MomentItem data = JSONResponse.toObject(response, MomentItem.class);
513516
if (data == null || data.getId() <= 0) {

‎APIJSON(Android)/APIJSON(AndroidStudio)/APIJSONApp/app/src/main/java/apijson/demo/client/activity_fragment/MomentListActivity.java‎

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

1515
package apijson.demo.client.activity_fragment;
1616

17-
import zuo.biao.apijson.JSON;
18-
import zuo.biao.library.base.BaseActivity;
19-
import zuo.biao.library.interfaces.OnBottomDragListener;
2017
import android.app.Activity;
2118
import android.content.Context;
2219
import android.content.Intent;
2320
import android.os.Bundle;
2421
import android.view.View;
25-
import apijson.demo.client.R;
26-
import apijson.demo.client.application.APIJSONApplication;
2722

2823
import com.alibaba.fastjson.JSONObject;
2924

25+
import apijson.demo.client.R;
26+
import apijson.demo.client.application.APIJSONApplication;
27+
import zuo.biao.apijson.JSON;
28+
import zuo.biao.library.base.BaseActivity;
29+
import zuo.biao.library.interfaces.OnBottomDragListener;
30+
3031
/**使用方法：复制>粘贴>改名>改代码 */
3132
/**fragmentActivity示例
3233
* @author Lemon
@@ -61,7 +62,7 @@ public static Intent createIntent(Context context, long userId) {
6162
* showSearch = true;
6263
* @param context
6364
* @param range
64-
* @param userId
65+
* @param id
6566
* @return
6667
*/
6768
public static Intent createIntent(Context context, int range, long id) {
@@ -88,7 +89,7 @@ public static Intent createIntent(Context context, JSONObject search, boolean sh
8889
/**启动这个Activity的Intent
8990
* @param context
9091
* @param range
91-
* @param userId
92+
* @param id
9293
* @param search
9394
* @param showSearch
9495
* @return
@@ -214,7 +215,7 @@ public void onDragBottom(boolean rightToLeft) {
214215

215216
fragment.onDragBottom(rightToLeft);
216217
return;
217-
}
218+
}
218219

219220
finish();
220221
}

‎APIJSON(Android)/APIJSON(AndroidStudio)/APIJSONApp/app/src/main/java/apijson/demo/client/activity_fragment/MomentListFragment.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ public String getCacheId(MomentItem data) {
279279
}
280280
@Override
281281
public int getCacheCount() {
282-
return 5;
282+
return 3;
283283
}
284284

285285

‎APIJSON(Android)/APIJSON(AndroidStudio)/APIJSONApp/app/src/main/java/apijson/demo/client/activity_fragment/PasswordActivity.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,6 @@
1414

1515
package apijson.demo.client.activity_fragment;
1616

17-
import zuo.biao.apijson.JSONResponse;
18-
import zuo.biao.library.base.BaseActivity;
19-
import zuo.biao.library.interfaces.OnBottomDragListener;
20-
import zuo.biao.library.manager.HttpManager.OnHttpResponseListener;
21-
import zuo.biao.library.ui.TextClearSuit;
22-
import zuo.biao.library.util.EditTextUtil;
23-
import zuo.biao.library.util.StringUtil;
2417
import android.app.Activity;
2518
import android.content.Context;
2619
import android.content.Intent;
@@ -32,11 +25,19 @@
3225
import android.widget.EditText;
3326
import android.widget.TextView;
3427
import android.widget.Toast;
28+
3529
import apijson.demo.client.R;
3630
import apijson.demo.client.application.APIJSONApplication;
3731
import apijson.demo.client.model.User;
3832
import apijson.demo.client.model.Verify;
3933
import apijson.demo.client.util.HttpRequest;
34+
import zuo.biao.apijson.JSONResponse;
35+
import zuo.biao.library.base.BaseActivity;
36+
import zuo.biao.library.interfaces.OnBottomDragListener;
37+
import zuo.biao.library.manager.HttpManager.OnHttpResponseListener;
38+
import zuo.biao.library.ui.TextClearSuit;
39+
import zuo.biao.library.util.EditTextUtil;
40+
import zuo.biao.library.util.StringUtil;
4041

4142
/**注册、验证码登录、重置密码等密码相关界面
4243
* @author Lemon
@@ -177,7 +178,6 @@ public void initData() {//必须调用
177178

178179
private TimeCount time;
179180
/**获取验证码
180-
* @param et
181181
*/
182182
private void getVerify() {
183183
if (EditTextUtil.isInputedCorrect(context, etPasswordPhone, EditTextUtil.TYPE_PHONE) == false) {
@@ -219,7 +219,7 @@ public void run() {
219219
*/
220220
private void toNextStep() {
221221
if (type != TYPE_VERIFY) {
222-
if (EditTextUtil.isInputedCorrect(context, etPasswordPassword0, EditTextUtil.TYPE_PASSWORD) == false
222+
if (EditTextUtil.isInputedCorrect(context, etPasswordPassword0, EditTextUtil.TYPE_PASSWORD) == false
223223
|| EditTextUtil.isInputedCorrect(context, etPasswordPassword1, EditTextUtil.TYPE_PASSWORD) == false) {
224224
return;
225225
}
@@ -243,14 +243,14 @@ private void toNextStep() {
243243
}
244244

245245
/**验证验证码
246-
* @param fromServer
246+
* @param fromServer
247247
*/
248248
private boolean checkVerify(boolean fromServer) {
249-
if (EditTextUtil.isInputedCorrect(context, etPasswordPhone, EditTextUtil.TYPE_PHONE) == false
249+
if (EditTextUtil.isInputedCorrect(context, etPasswordPhone, EditTextUtil.TYPE_PHONE) == false
250250
|| EditTextUtil.isInputedCorrect(context, etPasswordVerify, EditTextUtil.TYPE_VERIFY) == false) {
251251
return false;
252252
}
253-
253+
254254
if (fromServer) {
255255
showProgressDialog();
256256
HttpRequest.checkAuthCode(StringUtil.getTrimedString(etPasswordPhone),
@@ -268,15 +268,15 @@ private void register() {
268268
showProgressDialog();
269269
HttpRequest.register(StringUtil.getTrimedString(etPasswordVerify)
270270
, StringUtil.getTrimedString(etPasswordPhone)
271-
, StringUtil.getString(etPasswordPassword0),
271+
, StringUtil.getString(etPasswordPassword0),
272272
"APIJSONUser", 0, HTTP_REGISTER, this); // 注册接口
273273
}
274274

275275
private void setPassword() {
276276
showProgressDialog();
277277
HttpRequest.setPassword(StringUtil.getTrimedString(etPasswordVerify)
278278
, StringUtil.getTrimedString(etPasswordPhone)
279-
, StringUtil.getString(etPasswordPassword0),
279+
, StringUtil.getString(etPasswordPassword0),
280280
HTTP_RESET_PASSWORD, this); // 注册接口
281281
}
282282

@@ -423,7 +423,7 @@ public void run() {
423423
break;
424424
default:
425425
break;
426-
}
426+
}
427427
}
428428

429429
//系统自带监听方法<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<

‎APIJSON(Android)/APIJSON(AndroidStudio)/APIJSONApp/app/src/main/java/apijson/demo/client/activity_fragment/UserListActivity.java‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,23 @@
1414

1515
package apijson.demo.client.activity_fragment;
1616

17-
import java.io.Serializable;
18-
import java.util.List;
19-
20-
import zuo.biao.apijson.JSON;
21-
import zuo.biao.library.base.BaseActivity;
22-
import zuo.biao.library.interfaces.OnBottomDragListener;
2317
import android.app.Activity;
2418
import android.content.Context;
2519
import android.content.Intent;
2620
import android.os.Bundle;
2721
import android.view.View;
28-
import apijson.demo.client.R;
29-
import apijson.demo.client.application.APIJSONApplication;
3022

3123
import com.alibaba.fastjson.JSONObject;
3224

25+
import java.io.Serializable;
26+
import java.util.List;
27+
28+
import apijson.demo.client.R;
29+
import apijson.demo.client.application.APIJSONApplication;
30+
import zuo.biao.apijson.JSON;
31+
import zuo.biao.library.base.BaseActivity;
32+
import zuo.biao.library.interfaces.OnBottomDragListener;
33+
3334
/**使用方法：复制>粘贴>改名>改代码 */
3435
/**fragmentActivity示例
3536
* @author Lemon
@@ -65,7 +66,7 @@ public static Intent createIntent(Context context, long userId) {
6566
* showSearch = true;
6667
* @param context
6768
* @param range
68-
* @param userId
69+
* @param id
6970
* @return
7071
*/
7172
public static Intent createIntent(Context context, int range, long id) {
@@ -92,7 +93,7 @@ public static Intent createIntent(Context context, JSONObject search, boolean sh
9293
/**启动这个Activity的Intent
9394
* @param context
9495
* @param range
95-
* @param userId
96+
* @param id
9697
* @param search
9798
* @param showSearch
9899
* @return
@@ -230,7 +231,7 @@ public void onDragBottom(boolean rightToLeft) {
230231

231232
fragment.onDragBottom(rightToLeft);
232233
return;
233-
}
234+
}
234235

235236
finish();
236237
}

‎APIJSON(Android)/APIJSON(AndroidStudio)/APIJSONApp/app/src/main/java/apijson/demo/client/activity_fragment/UserListFragment.java‎

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

1515
package apijson.demo.client.activity_fragment;
1616

17-
import java.io.Serializable;
18-
import java.util.List;
19-
20-
import zuo.biao.apijson.JSON;
21-
import zuo.biao.apijson.JSONRequest;
22-
import zuo.biao.apijson.JSONResponse;
23-
import zuo.biao.apijson.StringUtil;
24-
import zuo.biao.library.base.BaseView.OnDataChangedListener;
25-
import zuo.biao.library.interfaces.AdapterCallBack;
26-
import zuo.biao.library.interfaces.CacheCallBack;
27-
import zuo.biao.library.interfaces.OnBottomDragListener;
28-
import zuo.biao.library.manager.HttpManager.OnHttpResponseListener;
29-
import zuo.biao.library.ui.EditTextInfoWindow;
3017
import android.annotation.SuppressLint;
3118
import android.app.Activity;
3219
import android.content.Intent;
@@ -38,15 +25,29 @@
3825
import android.widget.AdapterView;
3926
import android.widget.AdapterView.OnItemClickListener;
4027
import android.widget.ImageView;
28+
29+
import com.alibaba.fastjson.JSONObject;
30+
31+
import java.io.Serializable;
32+
import java.util.List;
33+
4134
import apijson.demo.client.R;
4235
import apijson.demo.client.adapter.UserAdapter;
4336
import apijson.demo.client.application.APIJSONApplication;
4437
import apijson.demo.client.base.BaseHttpListFragment;
4538
import apijson.demo.client.interfaces.TopBarMenuCallback;
4639
import apijson.demo.client.model.User;
4740
import apijson.demo.client.util.HttpRequest;
48-
49-
import com.alibaba.fastjson.JSONObject;
41+
import zuo.biao.apijson.JSON;
42+
import zuo.biao.apijson.JSONRequest;
43+
import zuo.biao.apijson.JSONResponse;
44+
import zuo.biao.apijson.StringUtil;
45+
import zuo.biao.library.base.BaseView.OnDataChangedListener;
46+
import zuo.biao.library.interfaces.AdapterCallBack;
47+
import zuo.biao.library.interfaces.CacheCallBack;
48+
import zuo.biao.library.interfaces.OnBottomDragListener;
49+
import zuo.biao.library.manager.HttpManager.OnHttpResponseListener;
50+
import zuo.biao.library.ui.EditTextInfoWindow;
5051

5152
/**用户列表界面fragment
5253
* @author Lemon
@@ -115,9 +116,7 @@ public static UserListFragment createInstance(int range, long id, JSONObject sea
115116
return fragment;
116117
}
117118
/**
118-
* @param range
119-
* @param id
120-
* @param search
119+
* @param idList
121120
* @return
122121
*/
123122
public static UserListFragment createInstance(List<Long> idList) {
@@ -320,7 +319,7 @@ public void onDragBottom(boolean rightToLeft) {
320319

321320
if (rightToLeft == false) {
322321
// toActivity(EditTextInfoWindow.createIntent(context
323-
// , EditTextInfoWindow.TYPE_PHONE, "手机号", null),
322+
// , EditTextInfoWindow.TYPE_PHONE, "手机号", null),
324323
// REQUEST_TO_EDIT_TEXT_INFO_ADD, false);
325324
startActivity(UserListActivity.createIntent(context, RANGE_ALL, 0).putExtra(INTENT_TITLE, "添加"));
326325
context.overridePendingTransition(R.anim.bottom_push_in, R.anim.hold);
@@ -335,11 +334,11 @@ public void onDragBottom(boolean rightToLeft) {
335334
}
336335
if (searchType == EditTextInfoWindow.TYPE_NAME) {
337336
toActivity(EditTextInfoWindow.createIntent(context
338-
, EditTextInfoWindow.TYPE_NAME, "姓名", null),
337+
, EditTextInfoWindow.TYPE_NAME, "姓名", null),
339338
REQUEST_TO_EDIT_TEXT_INFO_SEARCH, false);
340339
} else {
341340
toActivity(EditTextInfoWindow.createIntent(context
342-
, EditTextInfoWindow.TYPE_PHONE, "手机号", null),
341+
, EditTextInfoWindow.TYPE_PHONE, "手机号", null),
343342
REQUEST_TO_EDIT_TEXT_INFO_ADD, false);
344343
}
345344

0 commit comments

Comments
 (0)