Skip to content

Commit 58f8315

Browse files
TommyLemonTommyLemon
committed
Server:优化所有独立接口；与Client同步公共代码；Client:与Server同步公共代码；适配新版Server，删除Wallet
1 parent 47b6082 commit 58f8315

File tree

18 files changed

+624
-1020
lines changed

18 files changed

+624
-1020
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
import apijson.demo.client.application.APIJSONApplication;
4444
import apijson.demo.client.base.BaseFragment;
4545
import apijson.demo.client.interfaces.TopBarMenuCallback;
46-
import apijson.demo.client.model.Login;
4746
import apijson.demo.client.model.User;
4847
import apijson.demo.client.util.HttpRequest;
4948

@@ -320,7 +319,7 @@ public void onHttpResponse(int requestCode, String resultJson, Exception e) {
320319
}
321320
switch (requestCode) {
322321
case HTTP_LOUOUT:
323-
JSONResponse response = new JSONResponse(resultJson).getJSONResponse(Login.class.getSimpleName());
322+
JSONResponse response = new JSONResponse(resultJson).getJSONResponse(User.class.getSimpleName());
324323
boolean succeed = JSONResponse.isSuccess(response);
325324
Log.d(TAG, succeed ? "服务端退出成功" : "服务端退出失败");
326325
showShortToast(succeed ? "服务端退出成功" : "服务端退出失败");

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import android.widget.TextView;
3434
import apijson.demo.client.R;
3535
import apijson.demo.client.util.HttpRequest;
36-
import apijson.demo.server.model.Password;
36+
import apijson.demo.server.model.Privacy;
3737

3838
/**支付密码设置界面activity
3939
* @author Lemon
@@ -371,7 +371,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
371371
if (data != null) {
372372
password = data.getStringExtra(NumberPasswordActivity.RESULT_PASSWORD);
373373
if (StringUtil.isNotEmpty(password, true)) {
374-
HttpRequest.setPassword(Password.TYPE_PAY, password, phone, verify
374+
HttpRequest.setPassword(Privacy.PASSWORD_TYPE_PAY, password, phone, verify
375375
, HTTP_SET_PASSWORD, this);
376376
}
377377
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import android.view.View.OnClickListener;
3030
import android.widget.TextView;
3131
import apijson.demo.client.R;
32-
import apijson.demo.client.model.Wallet;
3332
import apijson.demo.client.util.HttpRequest;
3433
import apijson.demo.server.model.Privacy;
3534

‎APIJSON-Android/APIJSON-ADT/APIJSONApp/APIJSONApp/src/apijson/demo/client/model/Wallet.java‎

Lines changed: 0 additions & 41 deletions
This file was deleted.

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

Lines changed: 48 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import zuo.biao.apijson.JSONObject;
2121
import zuo.biao.apijson.JSONRequest;
2222
import zuo.biao.apijson.JSONResponse;
23+
import zuo.biao.apijson.RequestRole;
2324
import zuo.biao.library.manager.HttpManager.OnHttpResponseListener;
2425
import zuo.biao.library.util.Log;
2526
import zuo.biao.library.util.SettingUtil;
@@ -30,11 +31,9 @@
3031
import apijson.demo.server.model.Comment;
3132
import apijson.demo.server.model.Login;
3233
import apijson.demo.server.model.Moment;
33-
import apijson.demo.server.model.Password;
3434
import apijson.demo.server.model.Privacy;
3535
import apijson.demo.server.model.User;
3636
import apijson.demo.server.model.Verify;
37-
import apijson.demo.server.model.Wallet;
3837

3938
/**HTTP请求工具类
4039
* @author Lemon
@@ -132,19 +131,17 @@ public static void delete(JSONObject request, int requestCode, OnHttpResponseLis
132131

133132

134133

135-
//加 _ 表示class名，避免PASSWORD不知道是 Password 还是 password 这种冲突
134+
//加 _ 表示class名，避免VERIFY不知道是 Verify 还是 verify 这种冲突
136135
public static final String USER_;
137136
public static final String PRIVACY_;
138137
public static final String MOMENT_;
139138
public static final String COMMENT_;
140-
public static final String WALLET_;
141139
public static final String VERIFY_;
142140
static {
143141
USER_ = User.class.getSimpleName();
144142
PRIVACY_ = Privacy.class.getSimpleName();
145143
MOMENT_ = Moment.class.getSimpleName();
146144
COMMENT_ = Comment.class.getSimpleName();
147-
WALLET_ = Wallet.class.getSimpleName();
148145
VERIFY_ = Verify.class.getSimpleName();
149146
}
150147

@@ -157,7 +154,6 @@ public static void delete(JSONObject request, int requestCode, OnHttpResponseLis
157154

158155
public static final String ID = "id";
159156
public static final String USER_ID = "userId";
160-
public static final String CURRENT_USER_ID = "currentUserId";
161157

162158
public static final String NAME = "name";
163159
public static final String PHONE = "phone";
@@ -209,30 +205,12 @@ public static void delete(JSONObject request, int requestCode, OnHttpResponseLis
209205
*/
210206
public static void register(String verify, String phone, String password, String name, int sex
211207
, int requestCode, OnHttpResponseListener listener) {
212-
JSONObject request = new JSONRequest(new User().setName(name).setSex(sex))
213-
.setTag(USER_);
214-
request.put(VERIFY, verify);
215-
request.put(PHONE, phone);
216-
request.put(PASSWORD, password);
208+
JSONObject request = new JSONRequest(new Privacy(phone, password));
209+
request.puts(new User().setName(name).setSex(sex));
210+
request.puts(VERIFY, verify);
217211
HttpManager.getInstance().post(URL_BASE + "register", request, requestCode, listener);
218212
}
219-
/**重置密码
220-
* @param verify
221-
* @param phone
222-
* @param password
223-
* @param requestCode
224-
* @param listener
225-
*/
226-
public static void setPassword(String verify, String phone, String password
227-
, int requestCode, OnHttpResponseListener listener) {
228-
JSONRequest request = new JSONRequest();
229-
request.put(PHONE, phone);
230-
request.put(VERIFY, verify);
231-
request.put(PASSWORD, password);
232213

233-
HttpManager.getInstance().post(URL_BASE + "put/password"
234-
, request.setTag(PASSWORD), requestCode, listener);
235-
}
236214
/**
237215
* @param phone
238216
* @param requestCode
@@ -253,22 +231,14 @@ public static void login(String phone, String password, int type, int requestCod
253231
request.put(TYPE, type);
254232
request.put(PHONE, phone);
255233
request.put(PASSWORD, password);
256-
HttpManager.getInstance().post(
257-
URL_BASE + "login/"
258-
, request.setTag(Login.class.getSimpleName())
259-
, requestCode, listener
260-
);
234+
HttpManager.getInstance().post(URL_BASE + "login/", request, requestCode, listener);
261235
}
262236
/**退出登录
263237
* @param requestCode
264238
* @param listener
265239
*/
266240
public static void logout(int requestCode, OnHttpResponseListener listener) {
267-
HttpManager.getInstance().post(
268-
URL_BASE + "logout/"
269-
, new JSONRequest().setTag(Login.class.getSimpleName())
270-
, requestCode, listener
271-
);
241+
HttpManager.getInstance().post(URL_BASE + "logout/", new JSONRequest(), requestCode, listener);
272242
//不能在传到服务器之前销毁session
273243
new Handler().postDelayed(new Runnable() {
274244

@@ -279,6 +249,38 @@ public void run() {
279249
}, 500);
280250
}
281251

252+
/**重置登录密码
253+
* @param verify
254+
* @param phone
255+
* @param password
256+
* @param requestCode
257+
* @param listener
258+
*/
259+
public static void setPassword(String verify, String phone, String password
260+
, int requestCode, OnHttpResponseListener listener) {
261+
setPassword(verify, phone, password, Privacy.PASSWORD_TYPE_LOGIN, requestCode, listener);
262+
}
263+
/**重置密码
264+
* @param verify
265+
* @param phone
266+
* @param password
267+
* @param type
268+
* @param requestCode
269+
* @param listener
270+
*/
271+
public static void setPassword(String verify, String phone, String password, int type
272+
, int requestCode, OnHttpResponseListener listener) {
273+
JSONRequest request = new JSONRequest();
274+
request.put(VERIFY, verify);
275+
request.put(PHONE, phone);
276+
request.put(PASSWORD, password);
277+
request.put(TYPE, type);
278+
279+
HttpManager.getInstance().post(URL_BASE + "put/password", request, requestCode, listener);
280+
}
281+
282+
283+
282284
/**获取验证码
283285
* @param phone
284286
* @param requestCode
@@ -316,11 +318,11 @@ public static void checkVerify(String phone, String verify, int requestCode, OnH
316318
*/
317319
public static void setPassword(int type, String password, String phone, String verify
318320
, int requestCode, OnHttpResponseListener listener) {
319-
Password pwd = new Password(phone, password).setType(type);
320-
JSONRequest request = new JSONRequest(pwd);
321+
Privacy privacy = new Privacy(phone, password);
322+
JSONRequest request = new JSONRequest(privacy);
321323
request.put(VERIFY, verify);
322324

323-
put(request.setTag(Password.class.getSimpleName()), requestCode, listener);
325+
put(request.setTag(PRIVACY_), requestCode, listener);
324326
}
325327

326328
//account>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -635,7 +637,12 @@ public static void addComment(long momentId, long toCommentId, long toUserId, St
635637
* @param listener
636638
*/
637639
public static void deleteComment(long id, int requestCode, OnHttpResponseListener listener) {
638-
delete(new JSONRequest(new Comment(id)).setTag(COMMENT_), requestCode, listener);
640+
delete(new JSONRequest(
641+
new JSONObject(
642+
new Comment(id)
643+
).setRole(application.isCurrentUser(id) ? RequestRole.OWNER.name() : RequestRole.ADMIN.name())
644+
).setTag(COMMENT_)
645+
, requestCode, listener);
639646
}
640647

641648
//Comment>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

‎APIJSON-Android/APIJSON-ADT/APIJSONApp/APIJSONApp/src/apijson/demo/server/model/BaseModel.java‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,4 +250,53 @@ public static double value(Double value) {
250250
}
251251
//获取非基本类型对应基本类型的非空值 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>
252252

253+
/**index是否在arr长度范围内
254+
* @param index
255+
* @param array
256+
* @return
257+
*/
258+
public static boolean isIndexInRange(Integer index, Object[] array) {
259+
return index != null && index >= 0 && index < count(array);
260+
}
261+
262+
/**获取在arr长度范围内的index
263+
* defaultIndex = 0
264+
* @param index
265+
* @param array
266+
* @return
267+
*/
268+
public static int getIndexInRange(Integer index, Object[] array) {
269+
return getIndexInRange(index, array, 0);
270+
}
271+
/**获取在arr长度范围内的index
272+
* @param index
273+
* @param array
274+
* @param defaultIndex
275+
* @return
276+
*/
277+
public static int getIndexInRange(Integer index, Object[] array, int defaultIndex) {
278+
return isIndexInRange(index, array) ? index : defaultIndex;
279+
}
280+
281+
/**获取在arr长度范围内的index
282+
* defaultIndex = 0
283+
* @param <T>
284+
* @param index
285+
* @param array
286+
* @return
287+
*/
288+
public static <T> T getInRange(Integer index, T[] array) {
289+
return getInRange(index, array, 0);
290+
}
291+
/**获取在arr长度范围内的index
292+
* @param <T>
293+
* @param index
294+
* @param array
295+
* @param defaultIndex
296+
* @return
297+
*/
298+
public static <T> T getInRange(Integer index, T[] array, int defaultIndex) {
299+
return get(array, getIndexInRange(index, array, defaultIndex));
300+
}
301+
253302
}

0 commit comments

Comments
 (0)