发布3.2.0版本

xuexiangjys · Aug 8, 2021 · dfcb4fb · dfcb4fb
1 parent feb3be6
commit dfcb4fb
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -80,8 +80,8 @@ allprojects {
 dependencies {
   ...
   // XPage
-  implementation 'com.github.xuexiangjys.XPage:xpage-lib:3.1.1'
-  annotationProcessor 'com.github.xuexiangjys.XPage:xpage-compiler:3.1.1'
+  implementation 'com.github.xuexiangjys.XPage:xpage-lib:3.2.0'
+  annotationProcessor 'com.github.xuexiangjys.XPage:xpage-compiler:3.2.0'
   // ButterKnife的sdk
   implementation 'com.jakewharton:butterknife:10.1.0'
   annotationProcessor 'com.jakewharton:butterknife-compiler:10.1.0'
@@ -110,8 +110,8 @@ apply plugin: 'kotlin-kapt'
 dependencies {
   ...
   //XPage
-  implementation 'com.github.xuexiangjys.XPage:xpage-lib:3.1.1'
-  kapt 'com.github.xuexiangjys.XPage:xpage-compiler:3.1.1'
+  implementation 'com.github.xuexiangjys.XPage:xpage-lib:3.2.0'
+  kapt 'com.github.xuexiangjys.XPage:xpage-compiler:3.2.0'
   //ButterKnife的sdk
   implementation 'com.jakewharton:butterknife:10.1.0'
   kapt 'com.jakewharton:butterknife-compiler:10.1.0'
@@ -367,6 +367,31 @@ if (tabAFragment != null) {
 
 ## 混淆配置
 
+* 3.2.0及以上版本，使用的是gson进行序列化的，所以配置如下：
+
+```
+# gson
+-keepattributes Signature
+-keepattributes *Annotation*
+-dontwarn sun.misc.**
+-keep class com.google.gson.examples.android.model.** { <fields>; }
+-keep class * extends com.google.gson.TypeAdapter
+-keep class * implements com.google.gson.TypeAdapterFactory
+-keep class * implements com.google.gson.JsonSerializer
+-keep class * implements com.google.gson.JsonDeserializer
+-keepclassmembers,allowobfuscation class * {
+  @com.google.gson.annotations.SerializedName <fields>;
+}
+-keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken
+-keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken
+
+# xpage
+-keep class com.xuexiang.xpage.annotation.** { *; }
+-keep class com.xuexiang.xpage.config.** { *; }
+```
+
+* 3.1.1及以下版本，使用的是fastjson进行序列化的，所以配置如下：
+
 ```
 # fastjson
 -dontwarn com.alibaba.fastjson.**

diff --git a/app/src/main/java/com/xuexiang/xpagedemo/MyApplication.java b/app/src/main/java/com/xuexiang/xpagedemo/MyApplication.java
@@ -2,7 +2,6 @@
 
 import android.app.Application;
 
-import com.xuexiang.xpage.AutoPageConfiguration;
 import com.xuexiang.xpage.PageConfig;
 import com.xuexiang.xpage.base.XPageActivity;
 import com.xuexiang.xrouter.launcher.XRouter;
@@ -25,7 +24,7 @@ public void onCreate() {
 //                //页面注册,默认不设置的话使用的就是自动注册
 //                .setPageConfiguration(new AutoPageConfiguration())
                 //开启调试
-                .debug("PageLog")
+                .debug(isDebug())
                 //设置默认的容器Activity
                 .setContainActivityClazz(XPageActivity.class)
                 //初始化页面配置

diff --git a/docs/README.md b/docs/README.md
@@ -46,8 +46,8 @@ allprojects {
 dependencies {
   ...
   // XPage
-  implementation 'com.github.xuexiangjys.XPage:xpage-lib:3.1.1'
-  annotationProcessor 'com.github.xuexiangjys.XPage:xpage-compiler:3.1.1'
+  implementation 'com.github.xuexiangjys.XPage:xpage-lib:3.2.0'
+  annotationProcessor 'com.github.xuexiangjys.XPage:xpage-compiler:3.2.0'
   // ButterKnife的sdk
   implementation 'com.jakewharton:butterknife:10.1.0'
   annotationProcessor 'com.jakewharton:butterknife-compiler:10.1.0'
@@ -76,8 +76,8 @@ apply plugin: 'kotlin-kapt'
 dependencies {
   ...
   //XPage
-  implementation 'com.github.xuexiangjys.XPage:xpage-lib:3.1.1'
-  kapt 'com.github.xuexiangjys.XPage:xpage-compiler:3.1.1'
+  implementation 'com.github.xuexiangjys.XPage:xpage-lib:3.2.0'
+  kapt 'com.github.xuexiangjys.XPage:xpage-compiler:3.2.0'
   //ButterKnife的sdk
   implementation 'com.jakewharton:butterknife:10.1.0'
   kapt 'com.jakewharton:butterknife-compiler:10.1.0'

diff --git a/xpage-lib/src/main/java/com/xuexiang/xpage/PageConfig.java b/xpage-lib/src/main/java/com/xuexiang/xpage/PageConfig.java
@@ -66,6 +66,16 @@ public void init(Application application) {
         initPages(application);
     }
 
+    /**
+     * 设置是否打开调试
+     *
+     * @param isDebug 是否打开调试
+     */
+    public PageConfig debug(boolean isDebug) {
+        PageLog.debug(isDebug);
+        return this;
+    }
+
     /**
      * 设置调试模式
      *

diff --git a/xpage-lib/src/main/java/com/xuexiang/xpage/logger/PageLog.java b/xpage-lib/src/main/java/com/xuexiang/xpage/logger/PageLog.java
@@ -101,7 +101,7 @@ public static void setPriority(int priority) {
     /**
      * 设置是否打开调试
      *
-     * @param isDebug
+     * @param isDebug 是否打开调试
      */
     public static void debug(boolean isDebug) {
         if (isDebug) {
@@ -114,7 +114,7 @@ public static void debug(boolean isDebug) {
     /**
      * 设置调试模式
      *
-     * @param tag
+     * @param tag 日志标记
      */
     public static void debug(String tag) {
         if (!TextUtils.isEmpty(tag)) {