Skip to content

Commit cfc1364

Browse files
TommyLemonTommyLemon
committed
优化Server和Client工程结构，仅以JSON和StringUtil作为公共类，仅适用StringUtil.UTF_8
1 parent 3678fa6 commit cfc1364

File tree

16 files changed

+89
-181
lines changed

16 files changed

+89
-181
lines changed

‎APIJSON(Android)/APIJSON(ADT)/src/zuo/biao/apijson/JSON.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
import java.util.List;
1818

19-
import zuo.biao.apijson.client.StringUtil;
2019

2120
import com.alibaba.fastjson.JSONArray;
2221
import com.alibaba.fastjson.JSONObject;

APIJSON(Android)/APIJSON(ADT)/src/zuo/biao/apijson/client/StringUtil.java renamed to APIJSON(Android)/APIJSON(ADT)/src/zuo/biao/apijson/StringUtil.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
See the License for the specific language governing permissions and
1313
limitations under the License.*/
1414

15-
package zuo.biao.apijson.client;
15+
package zuo.biao.apijson;
1616

1717
import java.io.File;
1818
import java.math.BigDecimal;
@@ -33,6 +33,8 @@ public class StringUtil {
3333
public StringUtil() {
3434
}
3535

36+
public static final String UTF_8 = "utf-8";
37+
3638
public static final String EMPTY = "无";
3739
public static final String UNKNOWN = "未知";
3840
public static final String UNLIMITED = "不限";

‎APIJSON(Android)/APIJSON(ADT)/src/zuo/biao/apijson/client/HttpManager.java‎

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

1515
package zuo.biao.apijson.client;
1616

17+
import static zuo.biao.apijson.StringUtil.UTF_8;
18+
1719
import java.io.IOException;
1820
import java.net.CookieHandler;
1921
import java.net.URI;
@@ -27,6 +29,7 @@
2729
import org.json.JSONException;
2830
import org.json.JSONObject;
2931

32+
import zuo.biao.apijson.StringUtil;
3033
import android.content.Context;
3134
import android.os.AsyncTask;
3235
import android.text.TextUtils;
@@ -81,7 +84,6 @@ public synchronized static HttpManager getInstance() {
8184

8285
public static final String KEY_TOKEN = "token";
8386
public static final String KEY_COOKIE = "cookie";
84-
public static final String UTF_8 = "utf-8";
8587

8688

8789
/**GET请求

APIJSON(Android)/APIJSON(ADT)/src/zuo/biao/apijson/JSONObject.java renamed to APIJSON(Android)/APIJSON(ADT)/src/zuo/biao/apijson/client/JSONObject.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,17 @@
1212
See the License for the specific language governing permissions and
1313
limitations under the License.*/
1414

15-
package zuo.biao.apijson;
15+
package zuo.biao.apijson.client;
1616

17-
import static zuo.biao.apijson.client.HttpManager.UTF_8;
17+
import static zuo.biao.apijson.StringUtil.UTF_8;
1818

1919
import java.io.UnsupportedEncodingException;
2020
import java.net.URLDecoder;
2121
import java.net.URLEncoder;
2222
import java.util.Set;
2323

24-
import zuo.biao.apijson.client.StringUtil;
24+
import zuo.biao.apijson.JSON;
25+
import zuo.biao.apijson.StringUtil;
2526

2627
/**use this class instead of com.alibaba.fastjson.JSONObject
2728
* @author Lemon

‎APIJSON(Android)/APIJSON(ADT)/src/zuo/biao/apijson/client/JSONRequest.java‎

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

1515
package zuo.biao.apijson.client;
1616

17-
import zuo.biao.apijson.JSONObject;
17+
import zuo.biao.apijson.StringUtil;
18+
1819

1920
/**auto formatted request JSONObject
2021
* @author Lemon

‎APIJSON(Android)/APIJSON(ADT)/src/zuo/biao/apijson/client/JSONResponse.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import java.util.Set;
1919

2020
import zuo.biao.apijson.JSON;
21-
import zuo.biao.apijson.JSONObject;
21+
import zuo.biao.apijson.StringUtil;
2222

2323
import com.alibaba.fastjson.JSONArray;
2424

‎APIJSON(Android)/APIJSON(ADT)/src/zuo/biao/apijson/client/RequestUtil.java‎

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

1515
package zuo.biao.apijson.client;
1616

17-
import zuo.biao.apijson.JSONObject;
1817
import zuo.biao.apijson.client.model.Comment;
1918
import zuo.biao.apijson.client.model.User;
2019
import zuo.biao.apijson.client.model.Work;

‎APIJSON(Android)/APIJSON(ADT)/src/zuo/biao/apijson/client/RequestUtil2.java‎

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

1515
package zuo.biao.apijson.client;
1616

17-
import static zuo.biao.apijson.client.HttpManager.UTF_8;
17+
import static zuo.biao.apijson.StringUtil.UTF_8;
1818

1919
import java.io.UnsupportedEncodingException;
2020
import java.net.URLEncoder;
2121

2222
import zuo.biao.apijson.JSON;
23-
import zuo.biao.apijson.JSONObject;
23+
import zuo.biao.apijson.StringUtil;
2424
import zuo.biao.apijson.client.model.User;
2525
import zuo.biao.apijson.client.model.Work;
2626

@@ -141,15 +141,15 @@ public static JSONObject newComplexRequest() {
141141
JSONObject workObject = new JSONObject();
142142
// workObject.put("userId", "/User/id");
143143
try {
144-
workObject.put("userId", URLEncoder.encode("/User/id", HttpManager.UTF_8));
144+
workObject.put("userId", URLEncoder.encode("/User/id", UTF_8));
145145
} catch (Exception e) {
146146
e.printStackTrace();
147147
}
148148

149149
JSONObject commentObject = new JSONObject();
150150
// commentObject.put("workId", "[]/Work/id");
151151
try {
152-
commentObject.put("workId", URLEncoder.encode("[]/Work/id", HttpManager.UTF_8));
152+
commentObject.put("workId", URLEncoder.encode("[]/Work/id", UTF_8));
153153
} catch (Exception e) {
154154
e.printStackTrace();
155155
}
@@ -165,7 +165,7 @@ public static JSONObject newComplexRequest() {
165165
arrayObject.put("User", userObject);
166166
arrayObject.put("Work", workObject);
167167
try {
168-
arrayObject.put(URLEncoder.encode("Comment[]", HttpManager.UTF_8), commentArrayObject);
168+
arrayObject.put(URLEncoder.encode("Comment[]", UTF_8), commentArrayObject);
169169
} catch (UnsupportedEncodingException e1) {
170170
e1.printStackTrace();
171171
}

‎APIJSON(Android)/APIJSON(ADT)/src/zuo/biao/apijson/client/ui/QueryActivity.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,19 @@
1414

1515
package zuo.biao.apijson.client.ui;
1616

17+
import static zuo.biao.apijson.StringUtil.UTF_8;
18+
1719
import java.io.UnsupportedEncodingException;
1820
import java.net.URLEncoder;
1921
import java.util.List;
2022

2123
import zuo.biao.apijson.JSON;
24+
import zuo.biao.apijson.StringUtil;
2225
import zuo.biao.apijson.client.HttpManager;
2326
import zuo.biao.apijson.client.HttpManager.OnHttpResponseListener;
2427
import zuo.biao.apijson.client.JSONResponse;
2528
import zuo.biao.apijson.client.R;
2629
import zuo.biao.apijson.client.RequestUtil;
27-
import zuo.biao.apijson.client.StringUtil;
2830
import zuo.biao.apijson.client.model.Comment;
2931
import zuo.biao.apijson.client.model.User;
3032
import zuo.biao.apijson.client.model.Work;
@@ -227,7 +229,7 @@ public void openWebSite() {
227229
String webSite = null;
228230
try {
229231
webSite = StringUtil.getNoBlankString(url)
230-
+ URLEncoder.encode(StringUtil.getNoBlankString(request), HttpManager.UTF_8);
232+
+ URLEncoder.encode(StringUtil.getNoBlankString(request), UTF_8);
231233
} catch (UnsupportedEncodingException e) {
232234
e.printStackTrace();
233235
}

‎APIJSON(Server)/src/main/java/zuo/biao/apijson/JSON.java‎

Lines changed: 55 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,31 @@
1-
package zuo.biao.apijson;
1+
/*Copyright ©2015 TommyLemon(https://github.com/TommyLemon)
22
3-
import java.util.List;
3+
Licensed under the Apache License, Version 2.0 (the "License");
4+
you may not use this file except in compliance with the License.
5+
You may obtain a copy of the License at
6+
7+
http://www.apache.org/licenses/LICENSE-2.0
8+
9+
Unless required by applicable law or agreed to in writing, software
10+
distributed under the License is distributed on an "AS IS" BASIS,
11+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
See the License for the specific language governing permissions and
13+
limitations under the License.*/
414

15+
package zuo.biao.apijson;
16+
17+
import com.alibaba.fastjson.JSONArray;
518
import com.alibaba.fastjson.JSONObject;
619
import com.alibaba.fastjson.parser.Feature;
720
import com.alibaba.fastjson.serializer.SerializerFeature;
821

22+
import java.util.List;
23+
924
/**阿里json封装类 防止解析时异常
10-
* @author Young
11-
* @modifier Lemon
25+
* @author Lemon
1226
*/
1327
public class JSON {
14-
private static final String TAG = "Json";
28+
private static final String TAG = "JSON";
1529

1630
/**判断json格式是否正确
1731
* @param s
@@ -35,58 +49,70 @@ public static String getCorrectJson(String s) {
3549
return isJsonCorrect(s) ? s : "";
3650
}
3751

38-
39-
// parseObject(String text, Class<PersonalInfoDO> clazz)
40-
41-
public static JSONObject parseObject(String s) {
52+
/**json转JSONObject
53+
* @param json
54+
* @return
55+
*/
56+
public static JSONObject parseObject(String json) {
4257
try {
4358
int features = com.alibaba.fastjson.JSON.DEFAULT_PARSER_FEATURE;
4459
features |= Feature.SortFeidFastMatch.getMask();
45-
return com.alibaba.fastjson.JSON.parseObject(getCorrectJson(s), JSONObject.class, features);
60+
return com.alibaba.fastjson.JSON.parseObject(getCorrectJson(json), JSONObject.class, features);
4661
} catch (Exception e) {
4762
System.out.println(TAG + "parseObject catch \n" + e.getMessage());
4863
}
4964
return null;
5065
}
5166

52-
public static <T> T parseObject(String s, Class<T> clazz) {
67+
/**json转实体类
68+
* @param json
69+
* @param clazz
70+
* @return
71+
*/
72+
public static <T> T parseObject(String json, Class<T> clazz) {
5373
try {
5474
int features = com.alibaba.fastjson.JSON.DEFAULT_PARSER_FEATURE;
5575
features |= Feature.SortFeidFastMatch.getMask();
56-
return com.alibaba.fastjson.JSON.parseObject(getCorrectJson(s), clazz, features);
76+
return com.alibaba.fastjson.JSON.parseObject(getCorrectJson(json), clazz, features);
5777
} catch (Exception e) {
5878
System.out.println(TAG + "parseObject catch \n" + e.getMessage());
5979
}
6080
return null;
6181
}
6282

63-
// com.alibaba.fastjson.JSON.toJSONString
64-
public static String toJSONString(Object obj) {
83+
/**json转JSONArray
84+
* @param json
85+
* @return
86+
*/
87+
public static JSONArray parseArray(String json) {
88+
return com.alibaba.fastjson.JSON.parseArray(json);
89+
}
90+
/**json转实体类列表
91+
* @param json
92+
* @param clazz
93+
* @return
94+
*/
95+
public static <T> List<T> parseArray(String json, Class<T> clazz) {
6596
try {
66-
return com.alibaba.fastjson.JSON.toJSONString(obj, SerializerFeature.SortField);
97+
return com.alibaba.fastjson.JSON.parseArray(getCorrectJson(json), clazz);
6798
} catch (Exception e) {
68-
System.out.println(TAG + "toJSONString catch \n" + e.getMessage());
99+
System.out.println(TAG + "parseArray catch \n" + e.getMessage());
69100
}
70101
return null;
71102
}
72103

73-
// // com.alibaba.fastjson.JSON.toJSONString
74-
// public static <T> String toJSONString(List<T> list ){
75-
//
76-
// try {
77-
// return com.alibaba.fastjson.JSON.toJSONString(list);
78-
// } catch (Exception e) {
79-
// }
80-
// return null;
81-
// }
82-
// com.alibaba.fastjson.JSON.parseArray(json, NearbyCraftsManDO.class);
83-
public static <T> List<T> parseArray(String s, Class<T> clazz) {
104+
/**实体类转json
105+
* @param obj
106+
* @return
107+
*/
108+
public static String toJSONString(Object obj) {
84109
try {
85-
return com.alibaba.fastjson.JSON.parseArray(getCorrectJson(s), clazz);
110+
return com.alibaba.fastjson.JSON.toJSONString(obj, SerializerFeature.SortField);
86111
} catch (Exception e) {
87-
System.out.println(TAG + "parseArray catch \n" + e.getMessage());
112+
System.out.println(TAG + "toJSONString catch \n" + e.getMessage());
88113
}
89114
return null;
90115
}
91116

117+
92118
}

0 commit comments

Comments
 (0)