Skip to content

Commit dcaa866

Browse files
author
JemyCheung
committed
gson
1 parent 51836a0 commit dcaa866

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

library/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ android {
5151

5252
dependencies {
5353
implementation 'com.squareup.okhttp3:okhttp:4.2.2'
54-
//implementation 'com.squareup.okhttp3:okhttp:3.9.1'
5554
// for javax.annotation.Nullable use in custom MultipartBody and Headers implements.
5655
// implementation 'com.google.code.findbugs:jsr305:3.0.2'
5756
implementation fileTree(include: ['*.jar'], dir: 'libs')

library/library.iml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<option name="ALLOW_USER_CONFIGURATION" value="false" />
2020
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
2121
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
22-
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
22+
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
2323
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
2424
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
2525
<option name="PROJECT_TYPE" value="1" />

library/src/main/java/com/qiniu/android/utils/Json.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,12 @@ public static String encodeList(Collection collection) {
2424
}
2525

2626
public static String object2Json(Object obj) {
27-
String jsonString = new Gson().toJson(obj);
27+
String jsonString = "";
28+
try {
29+
jsonString = new Gson().toJson(obj);
30+
}catch (Throwable t) {
31+
// do nothing
32+
}
2833
return jsonString;
2934
}
3035
}

0 commit comments

Comments
 (0)