Skip to content

Commit 3f1d8ab

Browse files
TommyLemonTommyLemon
committed
server：同步eclipse版至idea版；client：同步adt版至studio版
1 parent 4308f38 commit 3f1d8ab

18 files changed

Lines changed: 436 additions & 192 deletions

File tree

‎APIJSON(Android)/APIJSON(AndroidStudio)/APIJSONLibrary/src/main/java/zuo/biao/apijson/client/JSONObject.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,20 @@ public void add(com.alibaba.fastjson.JSONObject object) {
112112
}
113113

114114

115+
public static final String KEY_TAG = "tag";
115116
public static final String KEY_COLUMNS = "columns";
117+
/**set tag
118+
* @param tag
119+
* @return
120+
*/
121+
public JSONObject setTag(String tag) {
122+
put(KEY_TAG, tag);
123+
return this;
124+
}
125+
public String getTag() {
126+
return getString(KEY_TAG);
127+
}
128+
116129
/**set columns need to be returned
117130
* @param columns "column0,column1,column2..."
118131
* @return

‎APIJSON(Android)/APIJSON(AndroidStudio)/app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</activity>
3030
<activity
3131
android:name="apijson.demo.ui.QueryActivity"
32-
android:label="Query" >
32+
android:label="@string/query" >
3333
</activity>
3434
</application>
3535

‎APIJSON(Android)/APIJSON(AndroidStudio)/app/src/main/java/apijson/demo/HttpManager.java‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,10 @@
3636
import android.util.Log;
3737
import apijson.demo.application.DemoApplication;
3838

39-
import com.squareup.okhttp.FormEncodingBuilder;
39+
import com.squareup.okhttp.MediaType;
4040
import com.squareup.okhttp.OkHttpClient;
4141
import com.squareup.okhttp.Request;
42+
import com.squareup.okhttp.RequestBody;
4243
import com.squareup.okhttp.Response;
4344

4445
/**HTTP请求管理类
@@ -136,7 +137,8 @@ protected void onPostExecute(Exception exception) {
136137

137138
}
138139

139-
140+
public static final MediaType TYPE_JSON =MediaType.parse("application/json; charset=utf-8");
141+
140142
/**POST请求
141143
* @param paramList 请求参数列表，（可以一个键对应多个值）
142144
* @param url 接口url
@@ -154,18 +156,19 @@ public void post(final String url_, final String request, final OnHttpResponseLi
154156
@Override
155157
protected Exception doInBackground(Void... params) {
156158

157-
FormEncodingBuilder fBuilder = new FormEncodingBuilder();
158159
try {
159-
String url = StringUtil.getNoBlankString(url_)
160-
+ URLEncoder.encode(StringUtil.getNoBlankString(request), UTF_8);
160+
String url = StringUtil.getNoBlankString(url_);
161161

162162
OkHttpClient client = getHttpClient(url);
163163
if (client == null) {
164164
return new Exception(TAG + ".post AsyncTask.doInBackground client == null >> return;");
165165
}
166+
167+
RequestBody requestBody = RequestBody.create(TYPE_JSON, request);
168+
166169
result = getResponseJson(client, new Request.Builder()
167170
.addHeader(KEY_TOKEN, getToken(url)).url(StringUtil.getNoBlankString(url))
168-
.post(fBuilder.build()).build());
171+
.post(requestBody).build());
169172
} catch (Exception e) {
170173
Log.e(TAG, "post AsyncTask.doInBackground try { result = getResponseJson(..." +
171174
"} catch (Exception e) {\n" + e.getMessage());

‎APIJSON(Android)/APIJSON(AndroidStudio)/app/src/main/java/apijson/demo/RequestUtil.java‎

Lines changed: 34 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414

1515
package apijson.demo;
1616

17+
import java.util.ArrayList;
18+
import java.util.List;
19+
20+
import zuo.biao.apijson.JSON;
1721
import zuo.biao.apijson.client.JSONObject;
1822
import zuo.biao.apijson.client.JSONRequest;
1923
import apijson.demo.model.Comment;
@@ -26,19 +30,45 @@
2630
*/
2731
public class RequestUtil {
2832

33+
public static JSONObject newPostRequest() {
34+
User data = new User();
35+
data.setName("Tommy");
36+
data.setSex(0);
37+
data.setPhone("1234567890");
38+
JSONRequest request = new JSONRequest();
39+
request.put(data);
40+
return request.setTag("post_user");
41+
}
42+
43+
public static JSONObject newDeleteRequest() {
44+
return new JSONRequest(new User(93794)).setTag("delete_user");
45+
}
46+
47+
public static JSONObject newPutRequest() {
48+
User data = new User(38710);
49+
List<String> list = new ArrayList<String>();
50+
list.add("http://static.oschina.net/uploads/user/1218/2437072_100.jpg?t=1461076033000");
51+
list.add("http://common.cnblogs.com/images/icon_weibo_24.png");
52+
list.add("http://static.oschina.net/uploads/user/585/1170143_50.jpg?t=1390226446000");
53+
data.setPicture(JSON.toJSONString(list));
54+
return new JSONRequest(data).setTag("put_user");
55+
}
56+
57+
58+
2959
public static JSONObject newSingleRequest() {
30-
return new JSONRequest(new User((long) 38710));
60+
return new JSONRequest(new User(38710));
3161
}
3262

3363
public static JSONObject newColumnsRequest() {
34-
JSONObject object = new JSONObject(new User((long) 38710));
64+
JSONObject object = new JSONObject(new User(38710));
3565
object.setColumns("id,name,phone");//StringUtil.getString(new String[]{"id", "name", "phone"}));//
3666
return new JSONRequest(User.class.getSimpleName(), object);
3767
}
3868

3969
public static JSONObject newRelyRequest() {
4070
JSONRequest request = new JSONRequest();
41-
request.put(new User((long) 70793));
71+
request.put(new User(70793));
4272
request.put(Work.class.getSimpleName(), new JSONRequest("userId", "User/id"));
4373
return request;
4474
}
@@ -48,7 +78,6 @@ public static JSONObject newArrayRequest() {
4878
}
4979

5080
public static JSONObject newComplexRequest() {
51-
5281
JSONRequest request = new JSONRequest();
5382
request.put(new User().setSex(0));
5483
request.put(Work.class.getSimpleName(), new JSONRequest("userId", "/User/id"));
@@ -60,7 +89,7 @@ public static JSONObject newComplexRequest() {
6089
}
6190

6291
public static JSONObject newAccessErrorRequest() {
63-
return new JSONRequest(new Wallet((long) 38710));
92+
return new JSONRequest(new Wallet(38710));
6493
}
6594

6695
public static JSONObject newAccessPermittedRequest() {

‎APIJSON(Android)/APIJSON(AndroidStudio)/app/src/main/java/apijson/demo/model/User.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ public class User extends BaseModel {
3131
public User() {
3232
super();
3333
}
34-
public User(Long id) {
34+
public User(long id) {
3535
this();
3636
this.id = id;
3737
}
38-
public User(Long id, String name) {
38+
public User(long id, String name) {
3939
this(id);
4040
this.name = name;
4141
}

‎APIJSON(Android)/APIJSON(AndroidStudio)/app/src/main/java/apijson/demo/model/Wallet.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class Wallet extends BaseModel {
3131
public Wallet() {
3232
super();
3333
}
34-
public Wallet(Long id) {
34+
public Wallet(long id) {
3535
this();
3636
this.id = id;
3737
}

0 commit comments

Comments
 (0)