Skip to content

Commit 0ae5da9

Browse files
TommyLemonTommyLemon
committed
Client:同步adt版至studio版
1 parent ceb2d5d commit 0ae5da9

93 files changed

Lines changed: 809 additions & 600 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ public static boolean isWord(String key) {
240240
* @return {@link #setColumn(String)}
241241
*/
242242
public JSONObject setColumn(String... keys) {
243-
return setColumn(StringUtil.getString(keys));
243+
return setColumn(StringUtil.getString(keys, true));
244244
}
245245
/**set keys need to be returned
246246
* @param keys "key0,key1,key2..."
@@ -259,7 +259,7 @@ public String getColumn() {
259259
* @return {@link #setGroup(String)}
260260
*/
261261
public JSONObject setGroup(String... keys) {
262-
return setGroup(StringUtil.getString(keys));
262+
return setGroup(StringUtil.getString(keys, true));
263263
}
264264
/**set keys for group by
265265
* @param keys "key0,key1,key2..."
@@ -278,7 +278,7 @@ public String getGroup() {
278278
* @return {@link #setHaving(String)}
279279
*/
280280
public JSONObject setHaving(String... keys) {
281-
return setHaving(StringUtil.getString(keys));
281+
return setHaving(StringUtil.getString(keys, true));
282282
}
283283
/**set keys for having
284284
* @param keys "key0,key1,key2..."
@@ -297,7 +297,7 @@ public String getHaving() {
297297
* @return {@link #setOrder(String)}
298298
*/
299299
public JSONObject setOrder(String... keys) {
300-
return setOrder(StringUtil.getString(keys));
300+
return setOrder(StringUtil.getString(keys, true));
301301
}
302302
/**set keys for order by
303303
* @param keys "key0,key1+,key2-..."

‎APIJSON(Android)/APIJSON(AndroidStudio)/APIJSONApp/APIJSONLibrary/src/main/java/zuo/biao/apijson/JSONResponse.java‎

Lines changed: 39 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ public JSONResponse(JSONObject object) {
5353
public static final String KEY_ID = "id";
5454
public static final String KEY_STATUS = "status";
5555
public static final String KEY_COUNT = "count";
56+
public static final String KEY_TOTAL = "total";
5657
public static final String KEY_MESSAGE = "message";
5758

5859
/**获取id
@@ -73,6 +74,17 @@ public int getStatus() {
7374
public int getCount() {
7475
return getIntValue(KEY_COUNT);
7576
}
77+
/**获取数量
78+
* @return
79+
*/
80+
public int getTotal() {
81+
try {
82+
return getIntValue(KEY_TOTAL);
83+
} catch (Exception e) {
84+
// TODO: handle exception
85+
}
86+
return 0;
87+
}
7688
/**获取信息
7789
* @return
7890
*/
@@ -285,8 +297,9 @@ public JSONArray toArray(String className) {
285297
return toArray(this, className);
286298
}
287299
/**
300+
* array.set(index, isContainer ? value : value.getJSONObject(className));
288301
* @param arrayObject
289-
* @param className
302+
* @param className className.isEmpty() == false && value.containsKey(className) >> isContainer = true;
290303
* @return
291304
*/
292305
public static JSONArray toArray(JSONObject arrayObject, String className) {
@@ -357,28 +370,32 @@ public static JSONObject format(final JSONObject response) {
357370

358371
Set<String> set = response.keySet();
359372
if (set != null) {
373+
360374
Object value;
361375
String arrayKey;
362376
for (String key : set) {
363377
value = response.get(key);
378+
364379
if (value instanceof JSONArray) {//转化JSONArray内部的APIJSON Array
365-
transferredObject.put(key, format((JSONArray) value));
380+
transferredObject.put(getSimpleName(key), format((JSONArray) value));
366381
} else if (value instanceof JSONObject) {//APIJSON Array转为常规JSONArray
367382
if (isArrayKey(key)) {//APIJSON Array转为常规JSONArray
368383
arrayKey = key.substring(0, key.indexOf(KEY_ARRAY));
369-
transferredObject.put(getArrayKey(arrayKey), format(toArray((JSONObject) value, arrayKey)));
384+
transferredObject.put(getArrayKey(getSimpleName(arrayKey))
385+
, format(toArray((JSONObject) value, arrayKey)));//需要将name:alias传至toArray
370386
} else {//常规JSONObject，往下一级提取
371-
transferredObject.put(key, format((JSONObject) value));
387+
transferredObject.put(getSimpleName(key), format((JSONObject) value));
372388
}
373389
} else {//其它Object，直接填充
374-
transferredObject.put(key, value);
390+
transferredObject.put(getSimpleName(key), value);
375391
}
376392
}
377393
}
378394

379395
Log.i(TAG, "format return transferredObject = " + JSON.toJSONString(transferredObject));
380396
return transferredObject;
381397
}
398+
382399
/**
383400
* @param responseArray
384401
* @return
@@ -409,13 +426,13 @@ public static JSONArray format(final JSONArray responseArray) {
409426

410427
/**替换key+KEY_ARRAY为keyList
411428
* @param key
412-
* @return isArrayKey(key) ? getArrayKey(...) : key
429+
* @return getSimpleName(isArrayKey(key) ? getArrayKey(...) : key) {@link #getSimpleName(String)}
413430
*/
414431
public static String replaceArray(String key) {
415432
if (isArrayKey(key)) {
416-
return getArrayKey(key.substring(0, key.indexOf(KEY_ARRAY)));
433+
key = getArrayKey(key.substring(0, key.indexOf(KEY_ARRAY)));
417434
}
418-
return key;
435+
return getSimpleName(key);
419436
}
420437
/**获取列表变量名
421438
* @param key => StringUtil.getNoBlankString(key)
@@ -433,5 +450,19 @@ public static String getArrayKey(String key) {
433450
}
434451
return key + "List";
435452
}
453+
454+
/**获取简单名称
455+
* @param fullName name 或 name:alias
456+
* @return name > name; name:alias > alias
457+
*/
458+
public static String getSimpleName(String fullName) {
459+
//key:alias -> alias; key:alias[] -> alias[]
460+
int index = fullName == null ? -1 : fullName.indexOf(":");
461+
if (index >= 0) {
462+
fullName = fullName.substring(index + 1);
463+
}
464+
return fullName;
465+
}
466+
436467

437468
}

‎APIJSON(Android)/APIJSON(AndroidStudio)/APIJSONApp/APIJSONLibrary/src/main/java/zuo/biao/apijson/StringUtil.java‎

Lines changed: 76 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
*/
2727
public class StringUtil {
2828
private static final String TAG = "StringUtil";
29-
29+
3030
public StringUtil() {
3131
}
3232

@@ -95,24 +95,48 @@ public static String getString(String s) {
9595
return s == null ? "" : s;
9696
}
9797
/**获取string,为null则返回""
98+
* ignoreEmptyItem = false;
99+
* split = ","
98100
* @param array
99-
* @return
101+
* @return {@link #getString(String[], boolean)}
100102
*/
101103
public static String getString(String[] array) {
102-
return getString(array, null);
104+
return getString(array, false);
105+
}
106+
/**获取string,为null则返回""
107+
* split = ","
108+
* @param array
109+
* @param ignoreEmptyItem
110+
* @return {@link #getString(String[], String, boolean)}
111+
*/
112+
public static String getString(String[] array, boolean ignoreEmptyItem) {
113+
return getString(array, null, ignoreEmptyItem);
103114
}
104115
/**获取string,为null则返回""
116+
* ignoreEmptyItem = false;
105117
* @param array
106118
* @param split
107-
* @return
119+
* @return {@link #getString(String[], String, boolean)}
108120
*/
109121
public static String getString(String[] array, String split) {
122+
return getString(array, split, false);
123+
}
124+
/**获取string,为null则返回""
125+
* @param array
126+
* @param split
127+
* @param ignoreEmptyItem
128+
* @return
129+
*/
130+
public static String getString(String[] array, String split, boolean ignoreEmptyItem) {
110131
String s = "";
111132
if (array != null) {
112133
if (split == null) {
113134
split = ",";
114135
}
115136
for (int i = 0; i < array.length; i++) {
137+
if (ignoreEmptyItem && isEmpty(array[i], true)) {
138+
continue;
139+
}
116140
s += ((i > 0 ? split : "") + array[i]);
117141
}
118142
}
@@ -206,8 +230,50 @@ public static int getLength(String s, boolean trim) {
206230
//获取string的长度>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
207231

208232

209-
//判断字符是否非空 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
233+
//判断字符是否为空 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
210234

235+
/**判断字符是否为空
236+
* @param object
237+
* @param trim
238+
* @return
239+
*/
240+
public static boolean isEmpty(Object object, boolean trim) {
241+
return isEmpty(getString(object), trim);
242+
}
243+
/**判断字符是否为空
244+
* @param cs
245+
* @param trim
246+
* @return
247+
*/
248+
public static boolean isEmpty(CharSequence cs, boolean trim) {
249+
return isEmpty(getString(cs), trim);
250+
}
251+
/**判断字符是否为空
252+
* @param s
253+
* @param trim
254+
* @return
255+
*/
256+
public static boolean isEmpty(String s, boolean trim) {
257+
// Log.i(TAG, "getTrimedString s = " + s);
258+
if (s == null) {
259+
return true;
260+
}
261+
if (trim) {
262+
s = s.trim();
263+
}
264+
if (s.isEmpty()) {
265+
return true;
266+
}
267+
268+
currentString = s;
269+
270+
return false;
271+
}
272+
273+
//判断字符是否为空 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
274+
275+
//判断字符是否非空 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
276+
211277
/**判断字符是否非空
212278
* @param object
213279
* @param trim
@@ -240,12 +306,12 @@ public static boolean isNotEmpty(String s, boolean trim) {
240306
if (s.length() <= 0) {
241307
return false;
242308
}
243-
309+
244310
currentString = s;
245-
311+
246312
return true;
247313
}
248-
314+
249315
//判断字符是否非空 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
250316

251317

@@ -261,7 +327,7 @@ public static boolean isNotEmpty(String s, boolean trim) {
261327
namePattern = Pattern.compile("^[0-9a-zA-Z_]+$");//已用55个中英字符测试通过
262328
smallAlphaPattern = Pattern.compile("[a-z]");
263329
}
264-
330+
265331
//判断手机格式是否正确
266332
public static boolean isPhone(String phone) {
267333
if (isNotEmpty(phone, true) == false) {
@@ -576,7 +642,7 @@ public static String getCorrectEmail(String email) {
576642
public static final int PRICE_FORMAT_PREFIX_WITH_BLANK = 3;
577643
public static final int PRICE_FORMAT_SUFFIX_WITH_BLANK = 4;
578644
public static final String[] PRICE_FORMATS = {
579-
"", "￥", "元", "￥ ", " 元"
645+
"", "￥", "元", "￥ ", " 元"
580646
};
581647

582648
/**获取价格，保留两位小数

‎APIJSON(Android)/APIJSON(AndroidStudio)/APIJSONApp/QRCodeLibrary/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,4 @@ android {
2222
dependencies {
2323
compile fileTree(dir: 'libs', include: ['*.jar'])
2424
testCompile 'junit:junit:4.12'
25-
compile project(':ZBLibrary')
2625
}

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

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,18 @@
66

77
<uses-sdk android:minSdkVersion="10" />
88

9+
<!-- 复制粘贴到你的工程的AndroidManifest.xml内对应位置 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< -->
10+
11+
12+
<!-- 需要的权限和功能 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< -->
913
<uses-permission android:name="android.permission.VIBRATE" />
1014
<uses-permission android:name="android.permission.CAMERA" />
15+
<uses-permission android:name="android.permission.FLASHLIGHT" />
1116

1217
<uses-feature android:name="android.hardware.camera" />
1318
<uses-feature android:name="android.hardware.camera.autofocus" />
19+
<!-- 需要的权限和功能 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> -->
1420

15-
<application
16-
android:theme="@style/AppTheme" >
17-
<activity android:name=".BarCodeTestActivity" >
18-
</activity>
19-
<activity
20-
android:name="com.zxing.activity.CaptureActivity"
21-
android:configChanges="orientation|keyboardHidden"
22-
android:screenOrientation="portrait"
23-
android:windowSoftInputMode="stateAlwaysHidden" >
24-
</activity>
25-
</application>
21+
<!-- 复制粘贴到你的工程的AndroidManifest.xml内对应位置 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> -->
2622

2723
</manifest>

0 commit comments

Comments
 (0)