Merge branch 'master' into dev.

JumeiRdGroup · Apr 25, 2017 · efab50e · efab50e
2 parents 00b8619 + d3dd041
commit efab50e
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 
 [English Version](README_EN.md)
 
-## PLog 2.0 beta2已经发布，欢迎试用！
+## PLog 2.0 beta2已经发布，欢迎试用！([迁移指南](https://github.com/Muyangmin/Android-PLog/wiki/Migrating))
 
 ## Summary / Features
 PLog是一个Android专用的日志封装库，具备以下特性：

diff --git a/app/src/main/java/org/mym/prettylog/MainActivity.java b/app/src/main/java/org/mym/prettylog/MainActivity.java
@@ -368,13 +368,21 @@ void logThrowable() {
     }
 
     void logJSON() {
+        //Sample 1: for JSON objects
         JSONObject jsonObject;
         try {
             jsonObject = new JSONObject(JSONEntity.DATA);
             PLog.json(jsonObject);
         } catch (JSONException e) {
             PLog.throwable(e);
         }
+
+        //Sample 2: for String arguments
+        PLog.objects(JSONEntity.DATA1);
+        PLog.objects(JSONEntity.DATA2);
+
+        //Sample 3: formatting json string with message tips
+        PLog.d("I have a json string like this: %s", JSONEntity.DATA1);
     }
 
     /**

diff --git a/app/src/main/java/org/mym/prettylog/data/JSONEntity.java b/app/src/main/java/org/mym/prettylog/data/JSONEntity.java
@@ -9,4 +9,50 @@ public class JSONEntity {
     public static final String DATA = "{\"favSites\":[{\"name\":\"google\",\"domain\":\"https:www" +
             ".google.com\"},{\"name\":\"facebook\",\"domain\":\"https:www.facebook.com\"}]," +
             "\"user\":{\"name\":\"Lari\",\"address\":null,\"cert\":true,\"preserved\":{}}}";
+
+    public static final String DATA1 = "{\"res\":true,\"data\":{\"id\":\"3\"," +
+            "\"icon\":\"http:\\/\\/182.254.246" +
+            ".232:8080\\/group1\\/M00\\/00\\/2E\\/Cvc9DVhGfa2AB2L8AAFB3Qh8cK4333.jpg\"," +
+            "\"begin_time\":\"2016-02-18\",\"end_time\":\"2017-01-06\"}}";
+
+    public static final String DATA2 = "{\"res\":true,\"data\":[{\"id\":\"164\"," +
+            "\"image\":\"http:\\/\\/182.254.246" +
+            ".232:8080\\/group1\\/M00\\/00\\/4A\\/Cvc9DVizzdiAKY1jAAKRlAaLiKU118.png\"," +
+            "\"name\":\"\\u6d4b\\u8bd5\\u670d\\u52a1963\",\"description\":\"\",\"url\":\"\"," +
+            "\"android_url\":\"122\",\"ios_url\":\"123\",\"share_title\":\"\"," +
+            "\"share_desc\":\"\",\"share_img\":\"\",\"share_url\":\"\"},{\"id\":\"163\"," +
+            "\"image\":\"http:\\/\\/182.254.246" +
+            ".232:8080\\/group1\\/M00\\/00\\/2A\\/Cvc9DVefAlKAP7h5AAOOMQZ-h_Q891.jpg\"," +
+            "\"name\":\"\\u5317\\u4eac\\u9996\\u9875\\u5f39\\u51fa\\u5f0f\\u6d3b\\u52a8-\\u706b" +
+            "\\u4e0a\\u56fe\\u7247111\"," +
+            "\"description\":\"qwewe\\u63cf\\u8ff0\\u63cf\\u8ff0\\u63cf\\u8ff0\\u63cf\\u8ff0" +
+            "\\u63cf\\u8ff0123\",\"url\":\"\",\"android_url\":\"\"," +
+            "\"ios_url\":\"YouHuiQuanInfoViewController\"," +
+            "\"share_title\":\"1\\u5206\\u4eab\\u6807\\u9898 " +
+            "*\\u539a\\u5927\\u53f8\\u8003\\u79ef\\u5206\\u4f1a729387\"," +
+            "\"share_desc\":\"2\\u5206\\u4eab\\u63cf\\u8ff0 *@#\\uffe5@#8988809\"," +
+            "\"share_img\":\"http:\\/\\/182.254.246" +
+            ".232:8080\\/group1\\/M00\\/00\\/28\\/Cvc9DVeC_ueAaqzNAAJ39TRp3Kw284.jpg\"," +
+            "\"share_url\":\"https:\\/\\/www.hao123.com\"},{\"id\":\"161\"," +
+            "\"image\":\"http:\\/\\/182.254.246" +
+            ".232:8080\\/group1\\/M00\\/00\\/2E\\/Cvc9DVhHouWAGG8TAABqLfQC_gM131.jpg\"," +
+            "\"name\":\"\\u6d4b\\u8bd5\\u8bf7\\u6c42\",\"description\":\"\"," +
+            "\"url\":\"http:\\/\\/www.hao123.com\",\"android_url\":\"\",\"ios_url\":\"\"," +
+            "\"share_title\":\"123\",\"share_desc\":\"123\",\"share_img\":\"http:\\/\\/182.254" +
+            ".246.232:8080\\/group1\\/M00\\/00\\/4A\\/Cvc9DViqlEaAXZLBAAAlZ9C9s9E767.png\"," +
+            "\"share_url\":\"http:\\/\\/www.hao123.com\"},{\"id\":\"160\"," +
+            "\"image\":\"http:\\/\\/182.254.246" +
+            ".232:8080\\/group1\\/M00\\/00\\/2B\\/Cvc9DVe0PleAA70nAAA5_udnrHw255.png\"," +
+            "\"name\":\"\\u7838\\u91d1\\u86cb\",\"description\":\"\",\"url\":\"http:\\/\\/www" +
+            ".hao123.com\",\"android_url\":\"\",\"ios_url\":\"\",\"share_title\":\"\"," +
+            "\"share_desc\":\"\",\"share_img\":\"\",\"share_url\":\"\"},{\"id\":\"143\"," +
+            "\"image\":\"http:\\/\\/182.254.246" +
+            ".232:8080\\/group1\\/M00\\/00\\/2A\\/Cvc9DVekSpiAQT3rAANCQokEWDs795.png\"," +
+            "\"name\":\"\\u65e0\\u9521\\u6d3b\\u52a8\",\"description\":\"\",\"url\":\"\"," +
+            "\"android_url\":\"\",\"ios_url\":\"\",\"share_title\":\"\",\"share_desc\":\"\"," +
+            "\"share_img\":\"\",\"share_url\":\"\"},{\"id\":\"141\",\"image\":\"http:\\/\\/182" +
+            ".254.246.232:8080\\/group1\\/M00\\/00\\/18\\/Cvc9DVbFaAaAKDPSAAKXIjV3N8Y263.jpg\"," +
+            "\"name\":\"\\u4e0a\\u6d77\",\"description\":\"\",\"url\":\"\",\"android_url\":\"\"," +
+            "\"ios_url\":\"\",\"share_title\":\"\",\"share_desc\":\"\",\"share_img\":\"\"," +
+            "\"share_url\":\"\"}]}";
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Sat Mar 04 15:17:59 CST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME