From f3f78ffcba2db1f282e33c53a1f35dfaaab3415c Mon Sep 17 00:00:00 2001
From: kongzue <myzcxhh@live.cn>
Date: Thu, 11 Jul 2019 20:48:12 +0800
Subject: [PATCH 01/18] 6.6.9 pub

---
 .idea/caches/build_file_checksums.ser         | Bin 592 -> 592 bytes
 .idea/gradle.xml                              |   3 +
 README.md                                     | 151 +-----------------
 app/build.gradle                              |   2 +-
 .../AdapterTestActivity.java                  |   4 +-
 .../baseframeworkdemo/FragmentDemo.java       |   9 +-
 .../baseframeworkdemo/JumpActivity.java       |   5 +-
 .../baseframeworkdemo/MainActivity.java       |   9 +-
 .../baseframeworkdemo/TransitionActivity.java |   4 +-
 app/src/main/res/values-en/strings.xml        |   2 +-
 baseframework/build.gradle                    |  10 +-
 .../kongzue/baseframework/BaseActivity.java   |  20 +--
 .../kongzue/baseframework/BaseAdapter.java    |   2 +-
 .../kongzue/baseframework/BaseFragment.java   |  10 +-
 .../kongzue/baseframework/util/DebugLogG.java |   2 +-
 .../util/FragmentChangeUtil.java              |   6 +-
 .../baseframework/util/Preferences.java       |  21 +++
 .../util/swipeback/SwipeBackActivity.java     |   5 +-
 .../util/swipeback/util/SwipeBackLayout.java  |   2 +-
 .../SwipeBackListenerActivityAdapter.java     |   2 +-
 .../util/swipeback/util/ViewDragHelper.java   |   8 +-
 .../baseframework/util/toast/SystemToast.java |   4 +-
 .../baseframework/util/toast/Toaster.java     |   2 +-
 build.gradle                                  |   2 +-
 gradle.properties                             |   2 +
 gradle/wrapper/gradle-wrapper.properties      |   4 +-
 26 files changed, 83 insertions(+), 208 deletions(-)

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 6f412988e0178f0b4880631bf22b1a84938782ce..b1147952a584ea874c605c319eb791f8aa5ee3d9 100644
GIT binary patch
delta 95
zcmV-l0HFWS1kePKm;~Vt^P7>JcMuaaf8NUk_^=f-M2eYoIa8A(0Ywl40j4<G&!v>F
zOB%M4zpyQncmbIZa6tlDTLjT*Am=w<!QgPFlOX~g5i|gma<poYizXoTp2+od=6H-a
BDF*-m

delta 95
zcmV-l0HFWS1kePKm;~Uib;OaJcM$1{skN;Re<yRea4_`KVrG*g0Ywm(e3YY%gMRp(
zA-{!WQEb+ecmbIZ9r?SArpHHZIc1@PkA0lQlOX~g5%Y}$s=Q#OPO?2_Gv>_@VtA}Z
BEm!~m

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index e2a3d5c..fd241bf 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,6 +3,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <compositeConfiguration>
+          <compositeBuild compositeDefinitionSource="SCRIPT" />
+        </compositeConfiguration>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
diff --git a/README.md b/README.md
index a046718..2d7a154 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# BaseFramework
+# BaseFramework(AndroidX)
 BaseFramework框架是我对之前编程开发的一些总结，目的是以最快的方式完成项目开发，因此将一些常用的小工具，例如简易吐司、简易log等放在了基础类中，只需要将您项目中的Activity或Fragment继承本框架中的BaseActivity以及BaseFragment，即可使用。
 除此之外BaseActivity还提供沉浸式适配，您可以查看Demo的源代码来了解更多。
 
@@ -35,7 +35,7 @@ Demo预览图如下：
 Maven仓库：
 ```
 <dependency>
-  <groupId>com.kongzue.baseframework</groupId>
+  <groupId>com.kongzue.baseframeworkx</groupId>
   <artifactId>baseframework</artifactId>
   <version>6.6.9</version>
   <type>pom</type>
@@ -44,7 +44,7 @@ Maven仓库：
 Gradle：
 在dependencies{}中添加引用：
 ```
-implementation 'com.kongzue.baseframework:baseframework:6.6.9'
+implementation 'com.kongzue.baseframeworkx:baseframework:6.6.9'
 ```
 
 ⚠现有 Beta 版本提供，具体详情请转至 <a href="#about">更新日志</a> 查看。
@@ -770,147 +770,4 @@ limitations under the License.
 
 ## <a name="about">更新日志</a>：
 v6.6.9:
-- 提升代码规范化；
-- AppManager 新增 setOnActivityStatusChangeListener(...) 用于监听 Activity 的创建、关闭以及全部 Activity 退出的状态；
-
-v6.6.8:
-- FragmentChangeUtil 新增 hideNow() 方法与 remove(fragment) 方法；
-- FragmentChangeUtil 提供普通添加方式和预加载方式；
-- BaseFragment 提供可重写方法 onShow 用于取代 onResume；
-
-v6.6.7:
-- 新增 error(...) 以代替快速调用 Log.e(...) ;
-- BaseFragment 新增方法 onLoad 以处理只在首次显示时执行的事务。
-- FragmentChangeUtil 新增 hide(...) 方法用于隐藏显示的 Fragment；
-
-v6.6.6:
-- BaseFragment 现已可使用泛型，来直接访问父 Activity 中的 public 方法和元素； 
-- 尝试性的提供了 Toast 的兼容模式，兼容解决部分设备因关闭“悬浮窗权限”导致 Toast 无法正常使用的问题，请使用 toastS(Object) 来调用此功能，或者使用 Toaster 类相关方法提供更多功能和可玩性。
-- BaseActivity 新增 getRootView() 方法可直接获取根布局；
-- 修复了 FragmentChangeUtil 在切换时错误调用未初始化状态的子 Fragment.onResume() 的问题；
-
-v6.6.5:
-- AppManager 新增排除结束方法 killOtherActivityExclude(class) 可排除指定 Activity 并结束之外的所有 Activity；
-- BaseActivity 以及 BaseFragment 新增 getColorS(resId) 以替代系统提供且不让修改的半残方法 getColor(resId)；
-
-v6.6.4:
-- 修复了属性动画存在的bug；
-- BaseAdapter 新增泛型功能；
-- 修复了 BaseFragment 重复加载导致组件指针绑定问题；
-- 新增 FragmentChangeUtil 管理工具，以便于在 BaseActivity 中轻松进行 Fragment 的绑定和切换；
-
-v6.6.3:
-- 修复了获取导航栏高度值错误的问题；
-- BaseFragment 中属性动画方法更新；
-
-v6.6.2:
-- 新增语言变更工具，具体请参照<a href="#9">语言变更工具</a>；
-
-v6.6.1:
-- BaseActivity 新增方法：获取设备IMEI：getIMEI()、获取设备AndroidID：getAndroidId()、获取Mac地址：getMacAddress()；
-- BaseFragment 新增方法 getStatusBarHeight()、getDisplayWidth()、getDisplayHeight()、getNavbarHeight()、getRootHeight()、getIMEI()、getAndroidId()、getMacAddress()；
-
-v6.6.0:
-- 组件升级至兼容 API-28；
-
-v6.5.9:
-- 修复了全屏注解 @FullScreen(true) 和侧滑返回可能存在冲突的问题；
-- BaseActivity 和 BaseFragment 新增成员变量 savedInstanceState 即 onCreate 发生时传递的 Bundle；
-
-v6.5.8:
-- BaseActivity、BaseFramework 新增 openUrl(...) 可直接打开使用默认浏览器打开 url 地址；
-- BaseActivity、BaseFramework 新增 openApp(...) 可直接打开指定包名的 App；
-- BaseActivity、BaseFramework 新增 isInstallApp(...) 可直接判断指定包名的 App 是否已安装；
-- log(...) 方法增强，全新的日志表现形式；
-- log(...) 输出 json 时会自动格式化 json 语法；
-- BaseActivity 新增注解 @SwipeBack(true) 可标记当前 Activity 支持侧滑返回；
-
-v6.5.7.2:
-- 新增判空规则，支持iOS可能传递的“(null)”文本；
-
-v6.5.7.1:
-- 修复无法引用的bug；
-
-v6.5.7:
-- 修复了 AppManager 中 killActivity(Class) 可能引发崩溃的bug；
-- 修改，将 BaseActivity.DEBUGMODE 移动到了 BaseFrameworkSettings.DEBUGMODE，原 BaseActivity.DEBUGMODE 不再使用；
-- 新增<a href="#7">行为与日志监听</a>功能；
-
-v6.5.6.1:
-- 修复 JumpParameter 空指针问题；
-
-v6.5.6:
-- BaseActivity 新增全局生命周期管理 GlobalLifeCircleListener；
-- 回传数据方法 setResponse(...) 现新增更符合直觉的 returnParameter(...)；
-- JumpParameter 可直接解析更多数据类型，例如 double、float、long、short 等；
-- initDatas(JumpParameter parameter) 中的参数 parameter 不再需要非空校验了；
-
-v6.5.5.3:
-- 修复遗留问题，BaseFragment的dip2px和px2dip将无需context参数；
-- 修复遗留问题，getDisplayWidth()函数名已被修改正确；
-
-v6.5.5.2:
-- 修复 lifeCircleListener.onCreate() 无效的问题；
-
-v6.5.5.1:
-- 警告：因命名冲突，6.5.5版本起，跳转回调参数 OnResponseListener 改名为 OnJumpResponseListener；
-- 可以使用bigLog(...)打印更长的日志了；
-- dip2px和px2dip不再需要context参数；
-- 显示/关闭键盘的方法setIMMStatus(...)将被更名为showIME(...)，目前新旧方法都可以使用；
-- 更新getNavbarHeight()方法，可以获取到更为准确的底栏高度；
-- 新增getRootHeight()方法，可以获取准确真正的屏幕高度（含底栏和状态栏）；
-- 新增BaseActivity注解 @FullScreen(true)可以直接使Activity全屏；
-- 修正了 @NavigationBarBackgroundColor(a,r,g,b)的默认值；
-- jump支持了共享元素，只需要在原参数末尾增加共享元素view，例如jump(Class<?> cls, View transitionView)；
-
-详细的更新说明请阅读：《BaseFramework 6.5.5.1版本更新报告》：<https://www.jianshu.com/p/9c2e0039aca1>
-
-v6.5.4:
-- 增加 BaseActivity 与 BaseFragment 一键管理生命周期监听器，可在 BaseActivity 的子类中使用 setLifeCircleListener(LifeCircleListener);
-- BaseAdapter 增加了 refreshDataChanged(...) 用于代替 notifyDataSetChanged() 刷新数据，新方法对于内容的变化也很敏感；
-
-v6.5.3:
-- 可以使用 runOnMain(Runnable) 来执行需要在主线程执行的事务，该方法与 runOnUiThread() 的不同点在于会自动判断当前 BaseActivity 是否处于存活状态，无须担心因此出现的空指针问题；
-- 可以使用 runOnMainDelayed(Runnable, time) 来执行需要在主线程延迟执行的事务；
-- 可以使用 runDelayed(Runnable, time) 来替代 new Handler().postDelayed(Runnable, time) 执行延迟事务；
-
-v6.5.2:
-- 修复 setIMMStatus(boolean, Edittext) 开关输入法方法中，Edittext 可能为 NULL 导致空指针的问题；
-- 跳转到应用设置方法 startAppSettings() 不再是私有的，他现在可以公开调用；
-
-v6.5.1:
-- 修复 bug；
-
-v6.5.0:
-- 修复 BaseFragment 中日志 log 打印不受 BaseActivity.DEBUGMODE 控制的问题；
-
-v6.5.0:
-- 跳转参数 JumpParameter 新增 getBoolean、getInt 和 getString 三个基础方法，从此方法获取数据不需要判断是否为空（null）以及进行强转类型；
-
-v6.4.9:
-- 为避免与 BaseOkHttp 框架冲突修改 com.kongzue.baseframework.util.Parameter 类名为 com.kongzue.baseframework.util.JumpParameter;
-- initDatas() 现已改为携带参数的 initDatas(JumpParameter paramer); 可以直接获取使用jump方法跳转时所携带的跳转参数，请注意非空判断；
-
-v6.4.8:
-- 新增BaseAdapter；
-
-v6.4.7:
-- 修复一些bug；
-
-v6.4.6:
-- 新增AppManager管理器；
-- 新增DarkNavigationBarTheme、DarkStatusBarTheme、NavigationBarBackgroundColor注解；
-
-v6.4.0:
-- 集成Preferences（SharedPreferences的封装，仅使用简单的get、set方法即可）
-
-v6.3.0:
-- 直接使用注解的方式绑定布局资源（@Layout）
-- 为BaseFragment增添支持新的jump(...)跳转方法；
-
-v6.2.0:
-- 支持新的jump(...)跳转方法；
-- 更新BaseFragment；
-
-v6.1.0:
-- 合并 BaseActivity 与 BaseFragment 为 BaseFramework 总框架；
+- 迁移至 AndroidX；
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 507d319..ad4815c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -19,6 +19,6 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
     implementation project(':baseframework')
 }
diff --git a/app/src/main/java/com/kongzue/baseframeworkdemo/AdapterTestActivity.java b/app/src/main/java/com/kongzue/baseframeworkdemo/AdapterTestActivity.java
index 06ef203..cdea616 100644
--- a/app/src/main/java/com/kongzue/baseframeworkdemo/AdapterTestActivity.java
+++ b/app/src/main/java/com/kongzue/baseframeworkdemo/AdapterTestActivity.java
@@ -1,7 +1,7 @@
 package com.kongzue.baseframeworkdemo;
 
-import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
+import androidx.appcompat.app.AppCompatActivity;
+
 import android.view.View;
 import android.widget.Button;
 import android.widget.ListView;
diff --git a/app/src/main/java/com/kongzue/baseframeworkdemo/FragmentDemo.java b/app/src/main/java/com/kongzue/baseframeworkdemo/FragmentDemo.java
index 7ab0fa2..017378f 100644
--- a/app/src/main/java/com/kongzue/baseframeworkdemo/FragmentDemo.java
+++ b/app/src/main/java/com/kongzue/baseframeworkdemo/FragmentDemo.java
@@ -54,10 +54,11 @@ public void setEvents() {
         btnHide.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                int changeTo = index;
-                if (changeTo > 2) changeTo = 0;
-                log("fragment " + index + " : 切换到：" + (changeTo + 1));
-                me.fragmentChangeUtil.show(changeTo);
+                //int changeTo = index;
+                //if (changeTo > 2) changeTo = 0;
+                //log("fragment " + index + " : 切换到：" + (changeTo + 1));
+                //me.fragmentChangeUtil.show(changeTo);
+                me.fragmentChangeUtil.hideNow();
             }
         });
     }
diff --git a/app/src/main/java/com/kongzue/baseframeworkdemo/JumpActivity.java b/app/src/main/java/com/kongzue/baseframeworkdemo/JumpActivity.java
index 6675d69..c343400 100644
--- a/app/src/main/java/com/kongzue/baseframeworkdemo/JumpActivity.java
+++ b/app/src/main/java/com/kongzue/baseframeworkdemo/JumpActivity.java
@@ -1,9 +1,8 @@
 package com.kongzue.baseframeworkdemo;
 
-import android.annotation.SuppressLint;
 import android.graphics.Bitmap;
-import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
+import androidx.appcompat.app.AppCompatActivity;
+
 import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
diff --git a/app/src/main/java/com/kongzue/baseframeworkdemo/MainActivity.java b/app/src/main/java/com/kongzue/baseframeworkdemo/MainActivity.java
index ebd79ba..bce5765 100644
--- a/app/src/main/java/com/kongzue/baseframeworkdemo/MainActivity.java
+++ b/app/src/main/java/com/kongzue/baseframeworkdemo/MainActivity.java
@@ -8,14 +8,13 @@
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.net.Uri;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.AlertDialog;
-import android.util.Log;
+
+import androidx.appcompat.app.AlertDialog;
+
 import android.view.View;
 import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.kongzue.baseframework.BaseActivity;
 import com.kongzue.baseframework.BaseFrameworkSettings;
@@ -29,7 +28,6 @@
 import com.kongzue.baseframework.util.OnPermissionResponseListener;
 import com.kongzue.baseframework.util.OnJumpResponseListener;
 import com.kongzue.baseframework.util.JumpParameter;
-import com.kongzue.baseframework.util.toast.Toaster;
 
 import java.io.File;
 import java.util.Locale;
@@ -92,6 +90,7 @@ public void initDatas(JumpParameter parameter) {
         BaseFrameworkSettings.turnOnReadErrorInfoPermissions(this, new OnBugReportListener() {
             @Override
             public void onReporter(final File file) {
+                log(file.getAbsolutePath());
                 runOnMain(new Runnable() {
                     @Override
                     public void run() {
diff --git a/app/src/main/java/com/kongzue/baseframeworkdemo/TransitionActivity.java b/app/src/main/java/com/kongzue/baseframeworkdemo/TransitionActivity.java
index 303e61e..491506b 100644
--- a/app/src/main/java/com/kongzue/baseframeworkdemo/TransitionActivity.java
+++ b/app/src/main/java/com/kongzue/baseframeworkdemo/TransitionActivity.java
@@ -1,7 +1,7 @@
 package com.kongzue.baseframeworkdemo;
 
-import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
+import androidx.appcompat.app.AppCompatActivity;
+
 import android.view.View;
 import android.widget.Button;
 
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index e3f85b9..31a3b12 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -5,7 +5,7 @@
 
     <string name="introduction">Introduction</string>
     <string name="viewOnGithub">View On Github</string>
-    <string name="introduction_tip">BaseFramework is a summary of my previous programming and development. The purpose is to complete the project development in the fastest way. Therefore, some commonly used small tools, such as simple toast and simple log, are placed in the basic class. You only need to inherit the BaseActivity and BaseFragment from your project. \n In addition, BaseActivity also provides immersive adaptation. You can check Demo's source code to learn more. \nThis is a Demo based on BaseActivity.</string>
+    <string name="introduction_tip">BaseFramework is a summary of my previous programming and development. The purpose is to complete the project development in the fastest way. Therefore, some commonly used small tools, such as simple toast and simple log, are placed in the basic class. You only need to inherit the BaseActivity and BaseFragment from your project. \n In addition, BaseActivity also provides immersive adaptation. You can check Demo\'s source code to learn more. \nThis is a Demo based on BaseActivity.</string>
 
     <string name="other">Others</string>
 </resources>
\ No newline at end of file
diff --git a/baseframework/build.gradle b/baseframework/build.gradle
index da64a20..5bb7f36 100644
--- a/baseframework/build.gradle
+++ b/baseframework/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'com.jfrog.bintray'
 def siteUrl = 'https://github.com/kongzue/BaseFramework' //项目在github主页地址
 def gitUrl = 'https://github.com/kongzue/BaseFramework.git'   //Git仓库的地址
 
-group = "com.kongzue.baseframework"//发布aar前缀根节点
+group = "com.kongzue.baseframeworkx"//发布aar前缀根节点
 version = "6.6.9"//发布aar的库版本
 
 android {
@@ -39,7 +39,7 @@ install {
         pom {
             project {
                 packaging 'aar'
-                name 'baseframework'//添加项目描述
+                name 'baseframeworkx'//添加项目描述
                 url siteUrl
                 licenses {
                     license {
@@ -80,7 +80,7 @@ bintray {
     configurations = ['archives']
     pkg {
         repo = "maven"
-        name = "BaseFramework" //项目在JCenter的名字
+        name = "BaseFrameworkX" //项目在JCenter的名字
         websiteUrl = siteUrl
         vcsUrl = gitUrl
         licenses = ["Apache-2.0"]
@@ -90,6 +90,6 @@ bintray {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:support-v4:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 }
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java b/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java
index 8b66421..bd992ba 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java
@@ -4,16 +4,13 @@
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.ActivityOptions;
-import android.content.ActivityNotFoundException;
 import android.content.ClipData;
 import android.content.ClipboardManager;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
 import android.graphics.Color;
 import android.graphics.Point;
 import android.net.Uri;
@@ -22,15 +19,14 @@
 import android.os.Environment;
 import android.os.Handler;
 import android.provider.Settings;
-import android.support.annotation.ColorInt;
-import android.support.annotation.ColorRes;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.SharedElementCallback;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.core.app.SharedElementCallback;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AppCompatActivity;
 import android.telephony.TelephonyManager;
-import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.Pair;
@@ -712,7 +708,7 @@ private boolean verifyPermissions(int[] grantResults) {
      * 显示提示对话框
      */
     private void showTipsDialog() {
-        new android.support.v7.app.AlertDialog.Builder(this)
+        new androidx.appcompat.app.AlertDialog.Builder(this)
                 .setTitle("警告")
                 .setMessage("需要必要的权限才可以正常使用该功能，您已拒绝获得该权限。\n如果需要重新授权，您可以点击“允许”按钮进入系统设置进行授权")
                 .setNegativeButton("取消", new DialogInterface.OnClickListener() {
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/BaseAdapter.java b/baseframework/src/main/java/com/kongzue/baseframework/BaseAdapter.java
index 4ac8f60..557ed3c 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/BaseAdapter.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/BaseAdapter.java
@@ -1,7 +1,7 @@
 package com.kongzue.baseframework;
 
 import android.content.Context;
-import android.support.annotation.LayoutRes;
+import androidx.annotation.LayoutRes;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java b/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java
index 0ee3937..6c64908 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java
@@ -5,11 +5,11 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.ColorRes;
-import android.support.annotation.IdRes;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.util.Log;
+import androidx.annotation.ColorRes;
+import androidx.annotation.IdRes;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/DebugLogG.java b/baseframework/src/main/java/com/kongzue/baseframework/util/DebugLogG.java
index 3f14692..8de03a7 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/util/DebugLogG.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/util/DebugLogG.java
@@ -63,7 +63,7 @@ public static void catchException(Context context, Thread t, Throwable e) {
         if (logFile == null) {
             createWriter(context);
         }
-        Preferences.getInstance().set(context, "cache", "bugReporterFile", logFile.getAbsolutePath());
+        Preferences.getInstance().commit(context, "cache", "bugReporterFile", logFile.getAbsolutePath());
         LogG(context, "\nError>>>\n" + getExceptionInfo(e));
     }
     
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/FragmentChangeUtil.java b/baseframework/src/main/java/com/kongzue/baseframework/util/FragmentChangeUtil.java
index d0158e7..a8f1895 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/util/FragmentChangeUtil.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/util/FragmentChangeUtil.java
@@ -1,9 +1,7 @@
 package com.kongzue.baseframework.util;
 
-import android.content.Context;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
-import android.util.Log;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
 
 import com.kongzue.baseframework.BaseActivity;
 import com.kongzue.baseframework.BaseFragment;
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/Preferences.java b/baseframework/src/main/java/com/kongzue/baseframework/util/Preferences.java
index b183acc..df1785d 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/util/Preferences.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/util/Preferences.java
@@ -83,6 +83,27 @@ public void set(Context context, String path, String preferencesName,int value){
         editor.putInt(preferencesName, value);
         editor.apply();
     }
+    
+    public void commit(Context context, String path, String preferencesName,String value){
+        SharedPreferences preferences = context.getSharedPreferences(path, Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = preferences.edit();
+        editor.putString(preferencesName, value);
+        editor.commit();
+    }
+    
+    public void commit(Context context, String path, String preferencesName,boolean value){
+        SharedPreferences preferences = context.getSharedPreferences(path, Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = preferences.edit();
+        editor.putBoolean(preferencesName, value);
+        editor.commit();
+    }
+    
+    public void commit(Context context, String path, String preferencesName,int value){
+        SharedPreferences preferences = context.getSharedPreferences(path, Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = preferences.edit();
+        editor.putInt(preferencesName, value);
+        editor.commit();
+    }
 
     //清除（清空）所有属性的方法
     public void cleanAll(Context context, String path){
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/swipeback/SwipeBackActivity.java b/baseframework/src/main/java/com/kongzue/baseframework/util/swipeback/SwipeBackActivity.java
index 86b35d3..a501afe 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/util/swipeback/SwipeBackActivity.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/util/swipeback/SwipeBackActivity.java
@@ -1,9 +1,8 @@
 package com.kongzue.baseframework.util.swipeback;
 
 import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
-import android.support.v7.app.AppCompatActivity;
-import android.view.View;
+
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.kongzue.baseframework.util.swipeback.util.SwipeBackActivityBase;
 import com.kongzue.baseframework.util.swipeback.util.SwipeBackActivityHelper;
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/swipeback/util/SwipeBackLayout.java b/baseframework/src/main/java/com/kongzue/baseframework/util/swipeback/util/SwipeBackLayout.java
index 495974d..f122272 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/util/swipeback/util/SwipeBackLayout.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/util/swipeback/util/SwipeBackLayout.java
@@ -6,7 +6,7 @@
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
-import android.support.v4.view.ViewCompat;
+import androidx.core.view.ViewCompat;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/swipeback/util/SwipeBackListenerActivityAdapter.java b/baseframework/src/main/java/com/kongzue/baseframework/util/swipeback/util/SwipeBackListenerActivityAdapter.java
index bd8540d..bf96e1b 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/util/swipeback/util/SwipeBackListenerActivityAdapter.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/util/swipeback/util/SwipeBackListenerActivityAdapter.java
@@ -1,7 +1,7 @@
 package com.kongzue.baseframework.util.swipeback.util;
 
 import android.app.Activity;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.lang.ref.WeakReference;
 
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/swipeback/util/ViewDragHelper.java b/baseframework/src/main/java/com/kongzue/baseframework/util/swipeback/util/ViewDragHelper.java
index 3977100..1e52e74 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/util/swipeback/util/ViewDragHelper.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/util/swipeback/util/ViewDragHelper.java
@@ -1,10 +1,10 @@
 package com.kongzue.baseframework.util.swipeback.util;
 
 import android.content.Context;
-import android.support.v4.view.MotionEventCompat;
-import android.support.v4.view.VelocityTrackerCompat;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.widget.ScrollerCompat;
+import androidx.core.view.MotionEventCompat;
+import androidx.core.view.VelocityTrackerCompat;
+import androidx.core.view.ViewCompat;
+import androidx.core.widget.ScrollerCompat;
 import android.view.MotionEvent;
 import android.view.VelocityTracker;
 import android.view.View;
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/toast/SystemToast.java b/baseframework/src/main/java/com/kongzue/baseframework/util/toast/SystemToast.java
index 38e9702..79ea486 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/util/toast/SystemToast.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/util/toast/SystemToast.java
@@ -5,8 +5,8 @@
 import android.os.Build;
 import android.os.Handler;
 import android.os.Message;
-import android.support.annotation.NonNull;
-import android.support.v4.app.NotificationManagerCompat;
+import androidx.annotation.NonNull;
+import androidx.core.app.NotificationManagerCompat;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/toast/Toaster.java b/baseframework/src/main/java/com/kongzue/baseframework/util/toast/Toaster.java
index 22b63da..7a64737 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/util/toast/Toaster.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/util/toast/Toaster.java
@@ -3,7 +3,7 @@
 import android.app.Activity;
 import android.content.Context;
 import android.os.Build;
-import android.support.v4.app.NotificationManagerCompat;
+import androidx.core.app.NotificationManagerCompat;
 import android.widget.Toast;
 
 import static com.kongzue.baseframework.BaseActivity.isMIUI;
diff --git a/build.gradle b/build.gradle
index b569879..094aa6d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.4.2'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
 
diff --git a/gradle.properties b/gradle.properties
index 743d692..8de5058 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,6 +6,8 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index af6032a..4dca3db 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue May 08 21:19:31 CST 2018
+#Thu Jul 11 20:28:36 CST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

From 8707d76cb25925406b5e3aff1d78dae48cc7009f Mon Sep 17 00:00:00 2001
From: kongzue <myzcxhh@live.cn>
Date: Tue, 20 Aug 2019 20:48:27 +0800
Subject: [PATCH 02/18] 6.7.0 pub

---
 README.md | 772 +-----------------------------------------------------
 1 file changed, 1 insertion(+), 771 deletions(-)

diff --git a/README.md b/README.md
index 2d7a154..d61f60e 100644
--- a/README.md
+++ b/README.md
@@ -1,773 +1,3 @@
 # BaseFramework(AndroidX)
-BaseFramework框架是我对之前编程开发的一些总结，目的是以最快的方式完成项目开发，因此将一些常用的小工具，例如简易吐司、简易log等放在了基础类中，只需要将您项目中的Activity或Fragment继承本框架中的BaseActivity以及BaseFragment，即可使用。
-除此之外BaseActivity还提供沉浸式适配，您可以查看Demo的源代码来了解更多。
 
-<a href="https://github.com/kongzue/BaseFramework/">
-<img src="https://img.shields.io/badge/BaseFramework-6.6.9-green.svg" alt="Kongzue BaseFramework">
-</a> 
-<a href="https://bintray.com/myzchh/maven/BaseFramework/6.6.9/link">
-<img src="https://img.shields.io/badge/Maven-6.6.9-blue.svg" alt="Maven">
-</a> 
-<a href="http://www.apache.org/licenses/LICENSE-2.0">
-<img src="https://img.shields.io/badge/License-Apache%202.0-red.svg" alt="License">
-</a> 
-<a href="http://www.kongzue.com">
-<img src="https://img.shields.io/badge/Homepage-Kongzue.com-brightgreen.svg" alt="Homepage">
-</a> 
-
-Demo预览图如下：
-
-![BaseFramework](https://github.com/kongzue/Res/raw/master/app/src/main/res/mipmap-xxxhdpi/BaseFramework.png)
-
-试用版和使用方法 Demo 可以前往 <https://fir.im/basefw> 下载
-
-![Kongzue's BaseFramework](https://github.com/kongzue/Res/raw/master/app/src/main/res/mipmap-xxxhdpi/download_baseframework.png)
-
-## 使用前的约定与须知
-
-- 更轻松！在 BaseActivity 中，约定关键词me代替Activity.this，因此您在编写代码时，在异步线程中可以轻松使用me关键字直接引用当前的父Activity。
-
-- 请忘掉重写你的 onCreate 吧！在新版本的 BaseFramework 中，您可以直接在 class 上使用注解 @Layout(R.layout.xxx) ，剩下的事情我们会自动帮您完成！
-
-- 规范化！无论是在 BaseActivity 还是 BaseFragment ，默认都有 initViews()、initDatas()、setEvents() 三个方法，他们分别代表加载组件、初始化数据、组件绑定事件三个步骤，因其执行顺序是固定的，且为了代码规范化，这三个方法必须重写，也建议将相关业务逻辑写在对应方法中，以方便维护和管理。
-
-## Maven仓库或Gradle的引用方式
-Maven仓库：
-```
-<dependency>
-  <groupId>com.kongzue.baseframeworkx</groupId>
-  <artifactId>baseframework</artifactId>
-  <version>6.6.9</version>
-  <type>pom</type>
-</dependency>
-```
-Gradle：
-在dependencies{}中添加引用：
-```
-implementation 'com.kongzue.baseframeworkx:baseframework:6.6.9'
-```
-
-⚠现有 Beta 版本提供，具体详情请转至 <a href="#about">更新日志</a> 查看。
-
-⚠从6.5.5版本起部分方法有较大变化，如有使用旧版本，请参阅<a href="#about">更新日志</a>
-
-# 目录
-
-· <a href="#1">BaseActivity功能</a>
-
-···· <a href="#1-1">沉浸式</a>
-
-···· <a href="#1-2">带自定义参数的跳转</a>
-
-···· <a href="#1-3">更简单的跳转后返回数据</a>
-
-···· <a href="#1-4">权限申请</a>
-
-···· <a href="#1-5">BaseActivity提供的小工具</a>
-
-···· <a href="#1-6">BaseActivity的生命周期</a>
-
-···· <a href="#1-7">侧滑返回</a>
-
-· <a href="#2">BaseFragment功能</a>
-
-· <a href="#3">Preferences</a>
-
-· <a href="#4">AppManager</a>
-
-· <a href="#5">异步或同步</a>
-
-· <a href="#6">BaseAdapter</a>
-
-···· <a href="#6-1">JavaBean 适配方式</a>
-
-···· <a href="#6-2">Map 适配方式</a>
-
-···· <a href="#6-3">多种布局的绑定方式</a>
-
-···· <a href="#6-4">数据刷新方法</a>
-
-· <a href="#8">增强型日志</a>
-
-· <a href="#7">行为与日志监听</a>
-
-· <a href="#9">语言变更工具</a>
-
-## <a name="1">BaseActivity功能</a>
-
-### <a name="1-1">沉浸式</a>
-
-- 在 BaseActivity 中，您还可以使用以下注解对沉浸式进行控制：
-```
-@DarkStatusBarTheme(true)           //开启顶部状态栏图标、文字暗色模式
-@DarkNavigationBarTheme(true)       //开启底部导航栏按钮暗色模式
-@NavigationBarBackgroundColor(a = 255,r = 255,g = 255,b = 255)      //设置底部导航栏背景颜色（a = 0,r = 0,g = 0,b = 0可透明）
-
-//也可从代码中进行控制：
-setDarkStatusBarTheme(true);            //开启顶部状态栏图标、文字暗色模式
-setDarkNavigationBarTheme(true);        //开启底部导航栏按钮暗色模式
-setNavigationBarBackgroundColor(Color.argb(255,255,255,255));       //设置底部导航栏背景颜色（a = 0,r = 0,g = 0,b = 0可透明）
-```
-
-### <a name="1-2">带自定义参数的跳转</a>
-Android 默认的 Intent无法支持自定义类型参数的跳转，BaseActivity 通过自有的数据通道允许传输自定义类型的数据给要跳转到的另一个 BaseActivity：
-
-跳转代码范例：
-```
-Bitmap bmp = BitmapFactory.decodeResource(getResources(), R.mipmap.img_bkg);
-jump(JumpActivity.class, new JumpParameter()
-        .put("参数1", "这是一段文字参数")
-        .put("参数2", bmp)
-);
-```
-
-接收数据代码范例：
-```
-String parameter1 = (String) getParameter().get("参数1");
-if (!isNull(parameter1)) txtP1.setText("第一个参数读取到的值为：" + parameter1);
-Bitmap parameter2 = (Bitmap) getParameter().get("参数2");
-if (parameter2 != null) imgP2.setImageBitmap(parameter2);
-```
-
-### <a name="1-3">更简单的跳转后返回数据</a>
-以往我们需要通过重写实现 onActivityResult 来实现回传数据，但在 BaseActivity 中，你只需要一个监听器：
-
-跳转代码范例：
-```
-jump(ResponseActivity.class, new OnJumpResponseListener() {
-    @Override
-    public void OnResponse(JumpParameter parameter) {
-        if (parameter == null) {
-            toast("未返回任何数据");
-        } else {
-            toast("收到返回数据，参数“返回数据1”中的值为：" + parameter.get("返回数据1"));
-        }
-    }
-});
-```
-
-亦可选用同时带参数+返回值的跳转：
-```
-jump(ResponseActivity.class,new JumpParameter()
-                .put("参数1", "这是一段文字参数")
-                .put("参数2", "这是一段文字参数")
-        , new OnJumpResponseListener() {
-    @Override
-    public void OnResponse(JumpParameter parameter) {
-        if (parameter==null){
-            toast("未返回任何数据");
-        }else{
-            toast("收到返回数据，参数“返回数据1”中的值为：" + parameter.get("返回数据1"));
-        }
-    }
-});
-```
-
-返回数据范例：
-```
-if ((boolean) getParameter().get("needResponse") == true) {
-    setResponse(new Parameter().put("返回数据1", "测试成功"));
-}
-
-//或也可以使用：
-if ((boolean) getParameter().get("needResponse") == true) {
-    returnParameter(new Parameter().put("返回数据1", "测试成功"));
-}
-```
-
-### <a name="1-4">权限申请</a>
-要进行权限申请也变得更加简单，只需要实现相应的回调 OnPermissionResponseListener 即可：
-```
-requestPermission(new String[]{Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION}, new OnPermissionResponseListener() {
-    @Override
-    public void onSuccess(String[] permissions) {
-        toast("申请权限成功");
-    }
-    @Override
-    public void onFail() {
-        toast("申请权限失败");
-    }
-});
-```
-
-### <a name="1-5">BaseActivity提供的小工具</a>
->简易吐司：
-```
-toast(Obj);
-```
->简易Log打印日志（BaseFrameworkSettings.DEBUGMODE = false关闭，注意此开关是同时影响 BaseActivity 和 BaseFragment的）：
-```
-log(Obj);
-```
->软键盘开关：
-```
-setIMMStatus(boolean show, EditText editText);
-```
->dip与像素px转换：
-```
-dip2px(float dpValue);
-```
->像素px与dip转换：
-```
-dip2px(float dpValue);
-```
->属性动画：
-```
-moveAnimation(Object obj, String perference, float aimValue, long time, long delay);
-```
->数据判空（适合网络返回值判断处理，即便为字符串“null”也为空）：
-```
-isNull(String);
-```
->跳转动画（参数为您的动画资源id）：
-```
-jumpAnim(int enterAnim, int exitAnim)
-```
->使用默认浏览器打开链接
-```
-openUrl(String url)
-```
->打开指定App
-```
-openApp(String packageName)
-```
->检测App是否已安装
-```
-isInstallApp(String packageName)
-```
->获取IMEI
-```
-//请预先在 AndroidManifest.xml 中声明：<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
-getIMEI()
-```
->获取AndroidID
-```
-getAndroidId()
-```
->获取Mac地址
-```
-//请预先在 AndroidManifest.xml 中声明：<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
-getMacAddress()
-```
->获取根布局
-```
-getRootView()
-```
-
-### <a name="1-6">BaseActivity的生命周期</a>
-
-通常的，您可以通过重写 onCreate()、 onResume()、 onPause()、 onDestroy() 四个方法来监控 Activity 的生命周期，但因为每个方法为独立的方法函数，可能在较多代码时不容易寻找他们的存在。
-
-在 BaseActivity 中，您可以通过 setLifeCircleListener(LifeCircleListener LifeCircleListener) 来直接添加一个生命周期监听器，其中就包含了上述的四个方法，进行统一管理：
-
-```
-setLifeCircleListener(new LifeCircleListener() {
-    @Override
-    public void onCreate() {
-
-    }
-    @Override
-    public void onResume() {
-
-    }
-    @Override
-    public void onPause() {
-
-    }
-    @Override
-    public void onDestroy() {
-
-    }
-});
-```
-
-如果你要监控所有 BaseActivity 的生命周期，在 6.5.6 版本起新增了 setGlobalLifeCircleListener(GlobalLifeCircleListener globalLifeCircleListener) 用于对所有 BaseActivity 进行统一管理：
-```
-BaseActivity.setGlobalLifeCircleListener(new GlobalLifeCircleListener() {
-    @Override
-    public void onCreate(BaseActivity me, String className) {
-
-    }
-    @Override
-    public void onResume(BaseActivity me, String className) {
-
-    }
-    @Override
-    public void onPause(BaseActivity me, String className) {
-
-    }
-    @Override
-    public void onDestroy(BaseActivity me, String className) {
-
-    }
-});
-```
-注意此方法为静态的，要使用它建议在 Application 中对它进行管理。
-
-从 6.6.9 版本起新增了 setOnActivityStatusChangeListener(...) 用于监听 Activity 的创建、关闭以及全部 Activity 退出的状态：
-```
-AppManager.setOnActivityStatusChangeListener(new AppManager.OnActivityStatusChangeListener() {
-    @Override
-    public void onActivityCreate(BaseActivity activity) {
-    
-    }
-    @Override
-    public void onActivityDestroy(BaseActivity activity) {
-    
-    }
-    @Override
-    public void onAllActivityClose() {
-        Log.e(">>>", "所有Activity已经关闭");
-    }
-});
-```
-
-### <a name="1-7">侧滑返回</a>
-
-从 6.5.8 版本起，您可以对 BaseActivity 进行注解，来实现侧滑返回：
-```
-@SwipeBack(true)        //开启侧滑返回
-public class YourActivity extends BaseActivity {
-//...
-```
-
-效果如下：
-
-![SwipeBack](https://github.com/kongzue/Res/raw/master/app/src/main/res/mipmap-xxxhdpi/baseframework_swipeback.png)
-
-此效果使用到的框架来源于开源的 @ikew0ng 的 SwipeBackLayout(<https://github.com/ikew0ng/SwipeBackLayout>) 开源协议为 Apache License2.0
-
-## <a name="2">BaseFragment功能</a>
-BaseFragment 与普通的 Fragment 有什么区别？
-
-首先，创建它变得异常的简单，你只需要在class上注解@Layout(你的布局资源文件id，例如R.layout.xxx)即可，剩下的事情BaseFragment会自动帮你完成。
-
-除此之外，我们还支持了直接使用 findViewById ，而不需要额外的找到根布局 rootView，再 rootView.findViewById(...)，查看代码了解更多
-
-BaseFragment 同样支持 BaseActivity 的一些小工具和组件，您可以轻松使用它们。
-
-BaseFragment 也支持生命周期集中管理，您同样可以在 BaseFragment 中通过 setLifeCircleListener(LifeCircleListener LifeCircleListener) 监控 BaseFragment 的生命周期。
-
-BaseFragment 在编写时建议约定泛型“ME”为要绑定的父 Activity，使用此功能可以在 BaseFragment 中直接使用父 Activity 中的 public 方法和元素，以下是返利：
-```
-@Layout(R.layout.fragment_demo)
-public class FragmentDemo extends BaseFragment<MainActivity> {      //此处约定泛型
-    private Button btnHide;
-    
-    //已省略绑定组件和初始化等方法
-   
-    @Override
-    public void setEvents() {
-        //此处为组件绑定事件
-        btnHide.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                me.hideFragment();                                  //可使用 me 关键字直接调用父 Activity 中的方法
-            }
-        });
-    }
-}
-```
-若不想约定，可将泛型设置为 BaseActivity。
-
-6.6.8 版本起，BaseFragment 新增一个可重写方法 onShow，之前的 onLoad 会在首次显示该 Fragment 时触发，而 onShow 是用来替代 onResume 的，但不会在预加载时触发。
-
-另外，onShow 的参数 isSwitchFragment(boolean) 用于判断是否是从其他 Fragment 切换到此界面。
-
-### FragmentChangeUtil
-6.6.4 版本起新增 FragmentChangeUtil 工具便于在 BaseActivity 中轻松进行 Fragment 的绑定和切换，使用方法如下：
-
-1) 初始化
-```
-//参数 BaseActivity 为要绑定到的 BaseActivity，参数 frameLayoutResId 为在该 Activity 中显示 Fragment 的容器，一般使用 FrameLayout 即可
-FragmentChangeUtil util = new FragmentChangeUtil(BaseActivity me, int frameLayoutResId);
-```
-
-2) 添加 Fragment 到管理工具
-```
-//普通添加方式：
-util.addFragment(new HomeFragment());
-util.addFragment(new MessageFragment());
-util.addFragment(new MeFragment());
-
-//预加载添加方式（initViews、initDatas、setEvents、onResume 都会被触发）
-util.addFragment(new HomeFragment(), true);
-util.addFragment(new MessageFragment(), true);
-util.addFragment(new MeFragment(), true);
-```
-
-3) 切换到指定 Fragment
-```
-//使用对象
-util.show(fragment);
-
-//或使用索引：
-util.show(int index);
-```
-* 索引即已添加的 Fragment 的编号。
-
-4) 额外方法：
-```
-//获取目前有几个已添加的 Fragment
-util.getCount();    
-
-//获取当前正在显示的 Fragment 对象
-util.getFocusFragment();
-
-//获取当前正在显示的 Fragment 对象的索引编号
-util.getFocusFragmentIndex();
-
-//删除对象
-util.remove(fragment);
-
-//隐藏当前 Fragment
-util.hideNow();
-
-//隐藏指定索引的 Fragment
-util.hide(int index);
-
-//隐藏指定 Fragment
-util.hide(fragment);
-```
-
-FragmentChangeUtil 现在提供两种 add 方式，一种是默认参数的 addFragment(BaseFragment fragment)，不再执行预加载，也就是说，执行后，仅添加了 Fragment 而不会执行任何事件。
-
-另一种 addFragment(BaseFragment fragment,boolean isPreload)，第二个参数为 true 时会预加载，initViews、initDatas、setEvents、onResume 都会被触发，这个和之前是一样的。
-
-
-## <a name="3">Preferences</a>
-Preferences是SharedPreferences的简易封装。
-
-每次手写SharedPreferences过于繁琐，因此封装了一个简易的属性记录读取类。 通过对属性的常见数据类型进行封装，使属性读取写入更方便，同时提供一些属性管理方法。
-```
-//读取属性为String类型
-//参数：context上下文索引，path路径，preferencesName属性名
-getString(context, path, preferencesName)
-//类似的，提供读取为Boolean的方法：
-getBoolean(context, path, preferencesName)
-//提供读取为Int的方法：
-getInt(context, path, preferencesName)
-
-//写入属性方法是统一的
-//参数：context上下文索引，path路径，preferencesName属性名，value根据属性数据类型定义
-set(context, path, preferencesName, ?)
-
-//提供清除（清空）所有属性的方法
-cleanAll();
-```
-
-## <a name="4">AppManager</a>
-AppManager 是 BaseActivity 的管理工具类，原工具是由 @xiaohaibin(<https://github.com/xiaohaibin>) 所开发，经同意集成在 BaseFramework 中，此处略加修改更适合 BaseActivity 的管理工作。
-
-提供如下方法：
-```
-killActivity(baseActivity)      //结束指定BaseActivity
-killAllActivity()               //结束所有BaseActivity
-AppExit()                       //退出App
-```
-其他方法，例如 pushActivity 添加Activity到堆栈，都是自动执行的，不需要手动调用。
-
-## <a name="5">异步或同步</a>
-有时我们需要等待一段时间执行事务，也有时我们需要从异步线程返回主线程进行 UI 等操作，这时往往需要在线程间进行切换进行操作，但偶尔也会因为执行过程中因 Activity 被关闭等问题出现空指针异常。
-
-此时可以使用 BaseFramework 自带的异步同步方法轻松跳跃线程进行操作，此方法包含在 BaseActivity 和 BaseFragment 中：
-
-1) 回到主线程操作：
-```
-runOnMain(new Runnable(){
-    //此处可切换回主线程进行操作
-});
-```
-
-2) 创建延迟在主线程执行操作：
-```
-runOnMainDelayed(new Runnable(){
-    //此处可切换回主线程进行延迟操作
-}, time);       //time 即延迟时间，毫秒单位
-```
-
-3) 创建延迟操作（用于代替 new Handler().postDelayed(Runnable, time)）：
-```
-runDelayed(new Runnable(){
-    //此处可进行延迟操作（可能在异步线程）
-}, time);       //time 即延迟时间，毫秒单位
-```
-
-## <a name="6">BaseAdapter</a>
-注意，此处的 BaseAdapter 特指 com.kongzue.baseframework.BaseAdapter。
-
-![Kongzue's BaseAdapter](https://github.com/kongzue/Res/raw/master/app/src/main/res/mipmap-xxxhdpi/download_baseadapter.png)
-
-通常由系统提供的的 android.widget.BaseAdapter 和 android.widget.SimpleAdapter 虽然都能满足我们的日常所需，但面对各种自定义需求以及多种布局的需求时往往捉襟见肘，以至于我们不得不重写 Adapter 来满足需求。
-
-但再重写过程中实际上是有很多重复性的代码，导致我们的项目臃肿不堪，从 v6.4.8 版本起，新增了 BaseAdapter 来实现各种自定义布局适配器的需求：
-
-### <a name="6-1">JavaBean 适配方式</a>
-
-使用此方式需要先创建继承自 BaseAdapter.BaseDataBean 的 JavaBean 数据集合来封装数据，例如在我们 Demo 中的：
-```
-List<CustomDatas> datas = new ArrayList();
-datas.add(new CustomDatas().setTitle("我是布局1"));
-datas.add(new CustomDatas().setTitle("我是布局2"));
-datas.add(new CustomDatas().setTitle("我是布局3"));
-```
-其中 CustomDatas 的具体代码为：
-```
-private class CustomDatas extends BaseAdapter.BaseDataBean {
-    String title;
-
-    @Override
-    public CustomDatas setType(int type) {
-        this.type = type;
-        return this;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public CustomDatas setTitle(String title) {
-        this.title = title;
-        return this;
-    }
-}
-```
-它是一个典型的 JavaBean，其中所有属性请根据实际业务需求添加，并建议生成相应的 get、set 方法。
-
-接下来创建适配器并绑定在相应组件上：
-```
-baseAdapter = new BaseAdapter(me, datas, R.layout.item_list_layout1, new SimpleAdapterSettings() {
-    @Override
-    public Object setViewHolder(View convertView) {
-        ViewHolder1 viewHolder1 = new ViewHolder1();
-        viewHolder1.txtTitle = convertView.findViewById(R.id.txt_title);
-        return viewHolder1;
-    }
-
-    @Override
-    public void setData(Object viewHolder, BaseAdapter.BaseDataBean dataBean) {
-        CustomDatas data = (CustomDatas) dataBean;
-        ViewHolder1 viewHolder1 = (ViewHolder1) viewHolder;
-        viewHolder1.txtTitle.setText(data.getTitle());
-    }
-});
-list.setAdapter(baseAdapter);
-```
-SimpleAdapterSettings 是一个适配器控制器的回调接口，在其中重写 setViewHolder 和 setData方法，其中 setViewHolder 需要您在此处根据父布局 convertView 创建布局管理组件 ViewHolder，并回传您的 ViewHolder。接下来会在 setData 中将 ViewHolder 和 相对应的数据 dataBean给出，请在此方法中对组件进行赋值和事件绑定。
-注意在此方法中您可以将 dataBean 强转为您的 JavaBean 类，viewHolder 也可以强转为您的 ViewHolder。
-
-### <a name="6-2">Map 适配方式</a>
-
-应对复杂多变的数据我们可能会选择使用 Map 来存储我们的需要展现的数据，BaseAdapter 亦支持此方式的数据，与上述方法类似，您可以轻松完成数据的绑定和组件的展现：
-```
-List<Map<String, Object>> datas = new ArrayList<>();
-Map<String, Object> map = new HashMap<>();
-map.put("title", "我是布局1");
-datas.add(map);
-map = new HashMap<>();
-map.put("title", "我是布局2");
-datas.add(map);
-map = new HashMap<>();
-map.put("title", "我是布局3");
-datas.add(map);
-baseAdapter = new BaseAdapter(me, datas, R.layout.item_list_layout1, new SimpleMapAdapterSettings() {
-    @Override
-    public Object setViewHolder(View convertView) {
-        ViewHolder1 viewHolder1 = new ViewHolder1();
-        viewHolder1.txtTitle = convertView.findViewById(R.id.txt_title);
-        return viewHolder1;
-    }
-
-    @Override
-    public void setData(Object viewHolder, Map<String, Object> data) {
-        ViewHolder1 viewHolder1 = (ViewHolder1) viewHolder;
-        viewHolder1.txtTitle.setText(data.get("title") + "");
-    }
-});
-list.setAdapter(baseAdapter);
-```
-
-### <a name="6-3">多种布局的绑定方式</a>
-
-根据实际业务需求，我们可能需要在一个组件中展现多种布局，此时您首先需要对您的布局进行编号，从0开始，依次往后，并将他们添加为一个 Map 集合，其中键值对：id对应布局资源id（LayoutResId）：
-```
-Map<Integer, Integer> layoutResIdMap = new HashMap<>();
-layoutResIdMap.put(0, R.layout.item_list_layout1);
-layoutResIdMap.put(1, R.layout.item_list_layout2);
-layoutResIdMap.put(2, R.layout.item_list_layout3);
-```
-接下来，您需要将数据存储为一个集合，此处展示的是 JavaBean 形式的存储方式，您亦可以使用 Map 作为数据的存储器，最后将它打包为一个 List即可：
-```
-List<CustomDatas> datas = new ArrayList();
-datas.add(new CustomDatas().setTitle("我是布局1").setType(0));
-datas.add(new CustomDatas().setTitle("我是布局2").setType(1));
-datas.add(new CustomDatas().setTitle("我是布局3").setType(2));
-```
-需要注意的是，之前提到过，您的 JavaBean（CustomDatas）需要继承自 BaseAdapter.BaseDataBean，而在 BaseAdapter.BaseDataBean 中，我们默认实现了一个属性“type”，它是 int 整数型，用于存储与布局对应的编号 id。
-
-如果您默认使用 Map 的方式存储数据，您需要手动 put("type", 对应布局编号id ) 以保证能够和布局资源相匹配。
-
-最后，创建适配器和绑定展示组件：
-```
-baseAdapter = new BaseAdapter(me, datas, layoutResIdMap, new MultipleAdapterSettings() {
-    @Override
-    public Object setViewHolder(int type, View convertView) {
-        switch (type) {
-            case 0:
-                ViewHolder1 viewHolder1 = new ViewHolder1();
-                viewHolder1.txtTitle = convertView.findViewById(R.id.txt_title);
-                return viewHolder1;
-            case 1:
-                ViewHolder2 viewHolder2 = new ViewHolder2();
-                viewHolder2.txtTitle = convertView.findViewById(R.id.txt_title);
-                return viewHolder2;
-            case 2:
-                ViewHolder3 viewHolder3 = new ViewHolder3();
-                viewHolder3.txtTitle = convertView.findViewById(R.id.txt_title);
-                return viewHolder3;
-            default:
-                return null;
-        }
-    }
-
-    @Override
-    public void setData(int type, Object viewHolder, BaseAdapter.BaseDataBean dataBean) {
-        CustomDatas data = (CustomDatas) dataBean;
-        switch (type) {
-            case 0:
-                ViewHolder1 viewHolder1 = (ViewHolder1) viewHolder;
-                viewHolder1.txtTitle.setText(data.getTitle());
-                break;
-            case 1:
-                ViewHolder2 viewHolder2 = (ViewHolder2) viewHolder;
-                viewHolder2.txtTitle.setText(data.getTitle());
-                break;
-            case 2:
-                ViewHolder3 viewHolder3 = (ViewHolder3) viewHolder;
-                viewHolder3.txtTitle.setText(data.getTitle());
-                break;
-        }
-    }
-});
-list.setAdapter(baseAdapter);
-```
-从上述代码中可以看到，回调函数中出现了一个 type 的值，在这里您可以根据不同的值绑定不同的布局，设置不同的数据和事件。
-
-以上就是关于 BaseAdapter 的简单介绍了。您还可以通过文档前半部分的二维码下载 Demo ，其中会为您展现关于 BaseAdapter 全部的绑定方式。
-
-### <a name="6-4">数据刷新方法</a>
-
-从 v6.5.4 版本起，我们添加了 refreshDataChanged(...) 用于代替 notifyDataSetChanged() 刷新数据，该方法主要目的为解决 notifyDataSetChanged() 对于某些内容变化不敏感的问题。
-
-使用方法为：
-```
-baseAdapter.refreshDataChanged(List<Map<String, Object>> newDatas);
-//或
-baseAdapter.refreshDataChanged(ArrayList<? extends BaseDataBean> newDatas);
-```
-
-## <a name="8">增强型日志</a>
-
-![Kongzue's log](https://github.com/kongzue/Res/raw/master/app/src/main/res/mipmap-xxxhdpi/baseframework_newlog.png)
-
-从 6.5.8 版本起使用 log(...) 方法输出的日志已升级为增强型日志。
-
-在您使用 BaseFramework 时可以在 Logcat 的筛选中使用字符 “>>>” 对日志进行筛选（Logcat日志界面上方右侧的搜索输入框）。
-
-1.在 Activity 启动和关闭时会有自动的提示：
-
-```
-D/>>>: MainActivity:onCreate
-...
-D/>>>: MainActivity:onDestroy
-```
-您可以在 Android Studio 的 File -> Settings 的 Editor -> Color Scheme -> Android Logcat 中调整各类型的 log 颜色，我们推荐如下图方式设置颜色：
-
-![Kongzue's log settings](https://github.com/kongzue/Res/raw/master/app/src/main/res/mipmap-xxxhdpi/baseframework_logsettings.png)
-
-2.对json进行自动格式化
-
-使用 log(...) 方法输出日志内容时，若内容是 json 字符串，会自动格式化输出，方便查看。
-
-
-## <a name="7">行为与日志监听</a>
-
-![Kongzue's Beta Plan](https://github.com/kongzue/Res/raw/master/app/src/main/res/mipmap-xxxhdpi/betaplan_baseframework.jpg)
-
-从 6.5.7 版本起新增了行为与日志监听功能，此功能默认是关闭的，此功能旨在帮助开发者进行良好的排错，包含Activity基本生命周期、使用log(...)语句输出的、使用toast(...)语句建立提示的、以及崩溃信息，在开启BETA_PLAN模式的情况下将按照App启动时间生成活动日志文件，以方便将App移交测试组进行测试。
-
-此功能的优势在于：
-
-1.可记录设备信息、系统版本信息、软件版本信息、设备ID等；
-
-2.可根据需要重点记录一些日志信息：注意，此工具仅限记录各Activity启停状态、使用BaseActivity、BaseFragment的log、toast方法生成的信息以及崩溃信息）而不会记录其他方式生成的日Logcat信息；
-
-3.可根据日志顺序按流程追溯用户操作步骤；
-
-您可以前往此处查看<a href="BUGREPORT.md">日志文件内容样例</a>
-
-### 开启功能
-
-开启所有日志保存功能，包含 Activity 基本生命周期、使用 log(...) 语句输出的、使用 toast(...) 输出的信息：
-```
-BaseFrameworkSettings.BETA_PLAN = true;
-```
-
-开启崩溃日志监控功能：
-```
-BaseFrameworkSettings.turnOnReadErrorInfoPermissions(context, new OnBugReportListener() {
-    @Override
-    public void onReporter(File file) {
-        Log.v(">>>", "onReporter: "+file.getAbsolutePath());
-    }
-});
-```
-当发生崩溃时，会在下次 App 启动后，此监听器中返回发生崩溃的整个 App 运行周期的日志文件（含崩溃信息）
-
-崩溃日志监控功能可以在不开启 BETA_PLAN 的情况下单独使用。
-
-注：获取的日志文件为 .bfl 格式的文本文件，可通过任意文本编辑器打开。
-
-### 建议
-建议在 OnBugReportListener 中接收到日志文件后，显示对话框提示用户是否愿意帮助改进App，并在用户同意后上传文件到您的服务器。
-
-## <a name="9">语言变更工具</a>
-
-从 6.6.2 版本起新增了语言变更工具，如果需要多语言支持，您可以先在 string.xml 中配置多国语言，然后使用如下方法进行语言变更：
-
-```
-BaseFrameworkSettings.selectLocale = Locale.ENGLISH;                //强制变成为英语
-BaseFrameworkSettings.selectLocale = Locale.CHINA;                  //强制变成为汉语
-BaseFrameworkSettings.selectLocale = Locale.SIMPLIFIED_CHINESE;     //强制变成为简体中文
-BaseFrameworkSettings.selectLocale = Locale.TRADITIONAL_CHINESE;    //强制变成为繁体中文
-```
-
-建议您在 Application 启动时设置此属性。
-
-需注意的是，修改此属性后并不会立即生效，需要重启您的 Activity 才可以生效，您也可以选择设置后重启当前 Activity 使其生效：
-
-```
-//注意先保存所有数据，然后使用如下语句重启当前Activity：
-restartMe();
-```
-
-## 开源协议
-```
-Copyright BaseFramework
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-```
-
-## <a name="about">更新日志</a>：
-v6.6.9:
-- 迁移至 AndroidX；
\ No newline at end of file
+更新日志和使用方法详见：https://github.com/kongzue/BaseFramework/
\ No newline at end of file

From d0df58255dfb8672758110dbde8e0e99ad87eec1 Mon Sep 17 00:00:00 2001
From: kongzue <myzcxhh@live.cn>
Date: Thu, 22 Aug 2019 21:08:35 +0800
Subject: [PATCH 03/18] 6.7.1 pub

---
 .idea/caches/build_file_checksums.ser         | Bin 592 -> 592 bytes
 .../AdapterTestActivity.java                  |  13 +-
 baseframework/build.gradle                    |   8 +-
 .../kongzue/baseframework/BaseActivity.java   | 149 +++++++++----
 .../kongzue/baseframework/BaseAdapter.java    |  72 +++---
 .../kongzue/baseframework/BaseFragment.java   | 205 +++++++++++++++++-
 .../baseframework/BaseFrameworkSettings.java  |   4 +-
 .../interfaces/FragmentLayout.java            |  21 ++
 .../interfaces/GlobalLifeCircleListener.java  |   2 +-
 .../interfaces/MultipleAdapterSettings.java   |   2 +-
 .../MultipleMapAdapterSettings.java           |   3 +-
 .../interfaces/OnFragmentChangeListener.java  |  16 ++
 .../interfaces/SimpleAdapterSettings.java     |   6 +-
 .../interfaces/SimpleMapAdapterSettings.java  |   5 +-
 .../baseframework/util/AppManager.java        |  27 ++-
 .../kongzue/baseframework/util/DebugLogG.java |  16 +-
 .../util/FragmentChangeUtil.java              | 102 ++++++---
 .../baseframework/util/JumpParameter.java     |  51 ++++-
 .../baseframework/util/ParameterCache.java    |  37 ++--
 .../baseframework/util/Preferences.java       | 139 ++++++++++--
 20 files changed, 687 insertions(+), 191 deletions(-)
 create mode 100644 baseframework/src/main/java/com/kongzue/baseframework/interfaces/FragmentLayout.java
 create mode 100644 baseframework/src/main/java/com/kongzue/baseframework/interfaces/OnFragmentChangeListener.java

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index b1147952a584ea874c605c319eb791f8aa5ee3d9..3375b19b2e7e480ab3dc1c13fbae8b618d274c53 100644
GIT binary patch
delta 37
vcmV+=0NVf11kePKmj!IOZ=9vEoOJ;ZW8OY5Or^Mwt^fW(m~k7IlOX~xNuv<%

delta 37
vcmV+=0NVf11kePKmj!F#4)dF_oOJ;Za6tlDTLjT*Am=w<!QgPFlOX~xF1QbF

diff --git a/app/src/main/java/com/kongzue/baseframeworkdemo/AdapterTestActivity.java b/app/src/main/java/com/kongzue/baseframeworkdemo/AdapterTestActivity.java
index cdea616..b1e6e9d 100644
--- a/app/src/main/java/com/kongzue/baseframeworkdemo/AdapterTestActivity.java
+++ b/app/src/main/java/com/kongzue/baseframeworkdemo/AdapterTestActivity.java
@@ -23,9 +23,6 @@
 import java.util.List;
 import java.util.Map;
 
-@Layout(R.layout.activity_adapter_test)
-@SwipeBack(true)
-@FullScreen(true)
 public class AdapterTestActivity extends BaseActivity {
     
     private TextView txtTitle;
@@ -113,7 +110,7 @@ public Object setViewHolder(View convertView) {
             }
             
             @Override
-            public void setData(Object viewHolder, Map data, int index) {
+            public void setData(Object viewHolder, Map data, List dataList, int index) {
                 ViewHolder1 viewHolder1 = (ViewHolder1) viewHolder;
                 viewHolder1.txtTitle.setText(data.get("title") + "");
             }
@@ -138,7 +135,7 @@ public Object setViewHolder(View convertView) {
             }
             
             @Override
-            public void setData(Object viewHolder, Object d, int index) {
+            public void setData(Object viewHolder, Object d, List dataList, int index) {
                 CustomDatas data = (CustomDatas) d;
                 ViewHolder1 viewHolder1 = (ViewHolder1) viewHolder;
                 viewHolder1.txtTitle.setText(data.getTitle());
@@ -190,7 +187,7 @@ public Object setViewHolder(int type, View convertView) {
             }
             
             @Override
-            public void setData(int type, Object vh, Map<String, Object> data, int index) {
+            public void setData(int type, Object vh, Map<String, Object> data, List<Map<String, Object>> dataList, int index) {
                 switch (type) {
                     case 0:
                         ViewHolder1 viewHolder1 = (ViewHolder1) vh;
@@ -245,7 +242,7 @@ public Object setViewHolder(int type, View convertView) {
             }
             
             @Override
-            public void setData(int type, Object vh, Object d, int index) {
+            public void setData(int type, Object vh, Object d, List dataList, int index) {
                 CustomDatas data = (CustomDatas) d;
                 switch (type) {
                     case 0:
@@ -297,4 +294,4 @@ public CustomDatas setTitle(String title) {
             return this;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/baseframework/build.gradle b/baseframework/build.gradle
index 5bb7f36..b292bfe 100644
--- a/baseframework/build.gradle
+++ b/baseframework/build.gradle
@@ -6,7 +6,7 @@ def siteUrl = 'https://github.com/kongzue/BaseFramework' //项目在github主页
 def gitUrl = 'https://github.com/kongzue/BaseFramework.git'   //Git仓库的地址
 
 group = "com.kongzue.baseframeworkx"//发布aar前缀根节点
-version = "6.6.9"//发布aar的库版本
+version = "6.7.1"//发布aar的库版本
 
 android {
     compileSdkVersion 28
@@ -14,8 +14,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 103
-        versionName "6.6.9"
+        versionCode 105
+        versionName "6.7.1"
     }
 
     buildTypes {
@@ -90,6 +90,6 @@ bintray {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 }
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java b/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java
index bd992ba..c39c0a8 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java
@@ -22,6 +22,7 @@
 import androidx.annotation.ColorInt;
 import androidx.annotation.ColorRes;
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
 import androidx.core.app.ActivityCompat;
 import androidx.core.app.SharedElementCallback;
 import androidx.core.content.ContextCompat;
@@ -38,6 +39,7 @@
 import android.widget.EditText;
 import android.widget.Toast;
 
+import com.kongzue.baseframework.interfaces.FragmentLayout;
 import com.kongzue.baseframework.interfaces.FullScreen;
 import com.kongzue.baseframework.interfaces.GlobalLifeCircleListener;
 import com.kongzue.baseframework.interfaces.LifeCircleListener;
@@ -48,6 +50,7 @@
 import com.kongzue.baseframework.interfaces.SwipeBack;
 import com.kongzue.baseframework.util.AppManager;
 import com.kongzue.baseframework.util.DebugLogG;
+import com.kongzue.baseframework.util.FragmentChangeUtil;
 import com.kongzue.baseframework.util.JsonFormat;
 import com.kongzue.baseframework.util.JumpParameter;
 import com.kongzue.baseframework.util.LanguageUtil;
@@ -80,13 +83,20 @@
 import static com.kongzue.baseframework.BaseFrameworkSettings.setNavigationBarHeightZero;
 
 /**
- * @Version: 6.5.6
+ * @Version: 6.7.0
  * @Author: Kongzue
- * @github: https://github.com/kongzue/BaseFrameworkSettings
+ * @github: https://github.com/kongzue/BaseFramework
  * @link: http://kongzue.com/
  * @describe: 自动化代码流水线作业，以及对原生安卓、MIUI、flyme的透明状态栏显示灰色图标文字的支持，同时提供一些小工具简化开发难度，详细说明文档：https://github.com/kongzue/BaseFramework
  */
 
+/**
+ * @Version: 6.7.0
+ * @Author: Kongzue
+ * @github: https://github.com/kongzue/BaseFramework
+ * @link: http://kongzue.com/
+ * @describe: 自动化代码流水线作业，以及对原生安卓、MIUI、flyme的透明状态栏显示灰色图标文字的支持，同时提供一些小工具简化开发难度，详细说明文档：https://github.com/kongzue/BaseFramework
+ */
 public abstract class BaseActivity extends AppCompatActivity implements SwipeBackActivityBase {
     
     private LifeCircleListener lifeCircleListener;                          //快速管理生命周期
@@ -98,6 +108,8 @@ public abstract class BaseActivity extends AppCompatActivity implements SwipeBac
     public OnJumpResponseListener onResponseListener;                       //jump跳转回调
     private OnPermissionResponseListener onPermissionResponseListener;      //权限申请回调
     
+    private FragmentChangeUtil fragmentChangeUtil;
+    
     public BaseActivity me = this;
     
     private boolean isFullScreen = false;
@@ -105,42 +117,11 @@ public abstract class BaseActivity extends AppCompatActivity implements SwipeBac
     private boolean darkNavigationBarThemeValue = false;
     private int navigationBarBackgroundColorValue = Color.BLACK;
     private int layoutResId = android.R.layout.list_content;
+    private int fragmentLayoutId = -1;
     
     private Bundle savedInstanceState;
     private SwipeBackActivityHelper mHelper;
     
-    //不再推荐重写onCreate创建Activity，新版本推荐直接在Activity上注解：@Layout(你的layout资源id)
-    @Deprecated
-    protected void onCreate(Bundle savedInstanceState, int layoutResId) {
-        super.onCreate(savedInstanceState);
-        this.savedInstanceState = savedInstanceState;
-        
-        logG("\n" + me.getClass().getSimpleName(), "onCreate");
-        info(2, me.getClass().getSimpleName() + ":onCreate");
-        
-        initAttributes();
-        
-        setContentView(layoutResId);
-        if (isFullScreen) {
-            getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
-            getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY | View.SYSTEM_UI_FLAG_FULLSCREEN);
-        } else {
-            setTranslucentStatus(true);
-        }
-        
-        isAlive = true;
-        
-        AppManager.getInstance().pushActivity(me);
-        
-        initViews();
-        initDatas(getParameter());
-        setEvents();
-        
-        if (lifeCircleListener != null){ lifeCircleListener.onCreate();}
-        if (globalLifeCircleListener != null){
-            globalLifeCircleListener.onCreate(me, me.getClass().getName());}
-    }
-    
     @Override
     @Deprecated
     protected void onCreate(Bundle savedInstanceState) {
@@ -158,6 +139,10 @@ protected void onCreate(Bundle savedInstanceState) {
             Log.e("警告！", "请在您的Activity的Class上注解：@Layout(你的layout资源id)");
             return;
         }
+        if (fragmentLayoutId != -1) {
+            fragmentChangeUtil = new FragmentChangeUtil(this, fragmentLayoutId);
+            initFragment(fragmentChangeUtil);
+        }
         
         setContentView(layoutResId);
         if (isFullScreen) {
@@ -172,9 +157,12 @@ protected void onCreate(Bundle savedInstanceState) {
         initDatas(getParameter());
         setEvents();
         
-        if (lifeCircleListener != null) {lifeCircleListener.onCreate();}
-        if (globalLifeCircleListener != null){
-            globalLifeCircleListener.onCreate(me, me.getClass().getName());}
+        if (lifeCircleListener != null) {
+            lifeCircleListener.onCreate();
+        }
+        if (globalLifeCircleListener != null) {
+            globalLifeCircleListener.onCreate(me, me.getClass().getName());
+        }
     }
     
     public void setLifeCircleListener(LifeCircleListener lifeCircleListener) {
@@ -187,12 +175,15 @@ private void initAttributes() {
             FullScreen fullScreen = getClass().getAnnotation(FullScreen.class);
             SwipeBack swipeBack = getClass().getAnnotation(SwipeBack.class);
             Layout layout = getClass().getAnnotation(Layout.class);
+            FragmentLayout fragmentLayout = getClass().getAnnotation(FragmentLayout.class);
             DarkNavigationBarTheme darkNavigationBarTheme = getClass().getAnnotation(DarkNavigationBarTheme.class);
             DarkStatusBarTheme darkStatusBarTheme = getClass().getAnnotation(DarkStatusBarTheme.class);
             NavigationBarBackgroundColor navigationBarBackgroundColor = getClass().getAnnotation(NavigationBarBackgroundColor.class);
             if (fullScreen != null) {
                 isFullScreen = fullScreen.value();
-                if (isFullScreen) {requestWindowFeature(Window.FEATURE_NO_TITLE);}
+                if (isFullScreen) {
+                    requestWindowFeature(Window.FEATURE_NO_TITLE);
+                }
             }
             mHelper.onActivityCreate();
             if (swipeBack != null) {
@@ -201,11 +192,19 @@ private void initAttributes() {
                 setSwipeBackEnable(false);
             }
             if (layout != null) {
-                if (layout.value() != -1){ layoutResId = layout.value();}
+                if (layout.value() != -1) {
+                    layoutResId = layout.value();
+                }
+            }
+            if (fragmentLayout != null) {
+                fragmentLayoutId = fragmentLayout.value();
+            }
+            if (darkStatusBarTheme != null) {
+                darkStatusBarThemeValue = darkStatusBarTheme.value();
+            }
+            if (darkNavigationBarTheme != null) {
+                darkNavigationBarThemeValue = darkNavigationBarTheme.value();
             }
-            if (darkStatusBarTheme != null) {darkStatusBarThemeValue = darkStatusBarTheme.value();}
-            if (darkNavigationBarTheme != null){
-                darkNavigationBarThemeValue = darkNavigationBarTheme.value();}
             if (navigationBarBackgroundColor != null) {
                 if (navigationBarBackgroundColor.a() != -1 && navigationBarBackgroundColor.r() != -1 && navigationBarBackgroundColor.g() != -1 && navigationBarBackgroundColor.b() != -1) {
                     navigationBarBackgroundColorValue = Color.argb(navigationBarBackgroundColor.a(), navigationBarBackgroundColor.r(), navigationBarBackgroundColor.g(), navigationBarBackgroundColor.b());
@@ -226,12 +225,63 @@ public void finishActivity() {
     }
     
     //可被重写的接口
+    
+    /**
+     * initViews会在启动时首先执行，建议在此方法内进行布局绑定、View初始化等操作
+     */
     public abstract void initViews();
     
-    public abstract void initDatas(JumpParameter paramer);
+    /**
+     * initDatas会在布局加载后执行，建议在此方法内加载数据和处理布局显示数据
+     *
+     * @param parameter 从其他界面传入的数据，提供GET、SET方法获取这些数据
+     */
+    public abstract void initDatas(JumpParameter parameter);
     
+    /**
+     * setEvents会在数据加载后执行，建议在此方法内绑定设置监听器、设置执行回调事件等操作
+     */
     public abstract void setEvents();
     
+    /**
+     * 若有 BaseFragment 切换需要，可以使用 @FragmentLayout(R.layout.frameLayout) 注解，初始化 FragmentChangeUtil，并在此方法内 addFragment
+     *
+     * @param fragmentChangeUtil BaseFragment管理和切换类
+     */
+    public void initFragment(FragmentChangeUtil fragmentChangeUtil) {
+    
+    }
+    
+    /**
+     * 切换至指定 BaseFragment
+     *
+     * @param index 已添加的 Fragment 编号（角标）
+     */
+    public void changeFragment(int index) {
+        if (fragmentChangeUtil != null) {
+            fragmentChangeUtil.show(index);
+        }
+    }
+    
+    /**
+     * 切换至指定 BaseFragment
+     *
+     * @param fragment 已添加的 Fragment 对象
+     */
+    public void changeFragment(BaseFragment fragment) {
+        if (fragmentChangeUtil != null) {
+            fragmentChangeUtil.show(fragment);
+        }
+    }
+    
+    /**
+     * 获取 FragmentChangeUtil 对象
+     */
+    public FragmentChangeUtil getFragmentChangeUtil() {
+        return fragmentChangeUtil;
+    }
+    
+    //主题相关设置方法
     public void setDarkStatusBarTheme(boolean value) {
         darkStatusBarThemeValue = value;
         setTranslucentStatus(true);
@@ -678,8 +728,9 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
         if (requestCode == REQUEST_CODE_PERMISSION) {
             if (verifyPermissions(grantResults)) {
-                if (onPermissionResponseListener != null){
-                    onPermissionResponseListener.onSuccess(permissions);}
+                if (onPermissionResponseListener != null) {
+                    onPermissionResponseListener.onSuccess(permissions);
+                }
             } else {
                 if (onPermissionResponseListener != null) {
                     onPermissionResponseListener.onFail();
@@ -708,7 +759,7 @@ private boolean verifyPermissions(int[] grantResults) {
      * 显示提示对话框
      */
     private void showTipsDialog() {
-        new androidx.appcompat.app.AlertDialog.Builder(this)
+        new AlertDialog.Builder(this)
                 .setTitle("警告")
                 .setMessage("需要必要的权限才可以正常使用该功能，您已拒绝获得该权限。\n如果需要重新授权，您可以点击“允许”按钮进入系统设置进行授权")
                 .setNegativeButton("取消", new DialogInterface.OnClickListener() {
@@ -1087,7 +1138,11 @@ protected void onResume() {
         isActive = true;
         logG("\n" + me.getClass().getSimpleName(), "onResume");
         if (onResponseListener != null) {
-            onResponseListener.OnResponse(ParameterCache.getInstance().getResponse(me.getClass().getName()));
+            JumpParameter responseData = ParameterCache.getInstance().getResponse(me.getClass().getName());
+            if (responseData==null){
+                responseData = new JumpParameter();
+            }
+            onResponseListener.OnResponse(responseData);
             onResponseListener = null;
         }
         super.onResume();
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/BaseAdapter.java b/baseframework/src/main/java/com/kongzue/baseframework/BaseAdapter.java
index 557ed3c..1119936 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/BaseAdapter.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/BaseAdapter.java
@@ -15,28 +15,28 @@
 import java.util.List;
 import java.util.Map;
 
-public class BaseAdapter<V,D> extends android.widget.BaseAdapter {
-
+public class BaseAdapter<V, D> extends android.widget.BaseAdapter {
+    
     public static final int TYPE_SIMPLE_DATA = 1;
     public static final int TYPE_MULTIPLE_DATA = 2;
     public static final int TYPE_MAP_DATA = 3;
-
+    
     private LayoutInflater mInflater;
     private List<D> simpleDatas;
     private List<? extends BaseDataBean> multipleDatas;
     private List<Map<String, Object>> mapDatas;
     private Context context;
-    private SimpleAdapterSettings<V,D> simpleAdapterSettings;
+    private SimpleAdapterSettings<V, D> simpleAdapterSettings;
     private SimpleMapAdapterSettings simpleMapAdapterSettings;
     private MultipleAdapterSettings multipleAdapterSettings;
     private MultipleMapAdapterSettings multipleMapAdapterSettings;
     private int dataType = 0;
-
+    
     private int layoutResId = -1;
     private Map<Integer, Integer> layoutResIdMap;
-
+    
     private int typeCount = 1;
-
+    
     public BaseAdapter(Context context, List<? extends BaseDataBean> datas, Map<Integer, Integer> layoutResId, MultipleAdapterSettings multipleAdapterSettings) {
         this.multipleDatas = datas;
         this.mapDatas = null;
@@ -47,10 +47,10 @@ public BaseAdapter(Context context, List<? extends BaseDataBean> datas, Map<Inte
         this.multipleAdapterSettings = multipleAdapterSettings;
         dataType = TYPE_MULTIPLE_DATA;
         mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-
+        
         typeCount = layoutResIdMap.size();
     }
-
+    
     public BaseAdapter(Context context, List<Map<String, Object>> datas, Map<Integer, Integer> layoutResId, MultipleMapAdapterSettings multipleMapAdapterSettings) {
         this.mapDatas = datas;
         this.simpleDatas = null;
@@ -61,11 +61,11 @@ public BaseAdapter(Context context, List<Map<String, Object>> datas, Map<Integer
         this.multipleMapAdapterSettings = multipleMapAdapterSettings;
         dataType = TYPE_MAP_DATA;
         mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-
+        
         typeCount = layoutResIdMap.size();
     }
-
-    public BaseAdapter(Context context, List<D> datas, @LayoutRes int layoutResId, SimpleAdapterSettings<V,D> simpleAdapterSettings) {
+    
+    public BaseAdapter(Context context, List<D> datas, @LayoutRes int layoutResId, SimpleAdapterSettings<V, D> simpleAdapterSettings) {
         this.simpleDatas = datas;
         this.mapDatas = null;
         this.multipleDatas = null;
@@ -75,10 +75,10 @@ public BaseAdapter(Context context, List<D> datas, @LayoutRes int layoutResId, S
         this.simpleAdapterSettings = simpleAdapterSettings;
         dataType = TYPE_SIMPLE_DATA;
         mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-
+        
         typeCount = 1;
     }
-
+    
     public BaseAdapter(Context context, List<Map<String, Object>> datas, @LayoutRes int layoutResId, SimpleMapAdapterSettings simpleMapAdapterSettings) {
         this.mapDatas = datas;
         this.simpleDatas = null;
@@ -89,15 +89,15 @@ public BaseAdapter(Context context, List<Map<String, Object>> datas, @LayoutRes
         this.simpleMapAdapterSettings = simpleMapAdapterSettings;
         dataType = TYPE_MAP_DATA;
         mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-
+        
         typeCount = 1;
     }
-
+    
     @Override
     public void notifyDataSetChanged() {
         super.notifyDataSetChanged();
     }
-
+    
     @Override
     public int getItemViewType(int position) {
         switch (dataType) {
@@ -115,7 +115,7 @@ public int getItemViewType(int position) {
                 return 1;
         }
     }
-
+    
     @Override
     public int getCount() {
         switch (dataType) {
@@ -129,7 +129,7 @@ public int getCount() {
                 return 0;
         }
     }
-
+    
     @Override
     public Object getItem(int i) {
         switch (dataType) {
@@ -143,23 +143,23 @@ public Object getItem(int i) {
                 return null;
         }
     }
-
+    
     @Override
     public long getItemId(int i) {
         return i;
     }
-
+    
     @Override
     public int getViewTypeCount() {
         return typeCount;
     }
-
+    
     @Override
     public View getView(final int i, View convertView, ViewGroup viewGroup) {
         switch (dataType) {
             case TYPE_MULTIPLE_DATA:
                 BaseDataBean multipleData = multipleDatas.get(i);
-
+                
                 Object multipleViewHolder = null;
                 int layoutId = layoutResIdMap.get(multipleData.getType());
                 if (convertView == null) {
@@ -169,11 +169,11 @@ public View getView(final int i, View convertView, ViewGroup viewGroup) {
                 } else {
                     multipleViewHolder = convertView.getTag();
                 }
-                multipleAdapterSettings.setData(multipleData.getType(), multipleViewHolder, multipleData, i);
+                multipleAdapterSettings.setData(multipleData.getType(), multipleViewHolder, multipleData, multipleDatas, i);
                 return convertView;
             case TYPE_SIMPLE_DATA:
                 D simpleData = simpleDatas.get(i);
-
+                
                 if (layoutResId == -1) {
                     new Exception("请设置layoutResId");
                     return null;
@@ -186,12 +186,12 @@ public View getView(final int i, View convertView, ViewGroup viewGroup) {
                     } else {
                         simpleViewHolder = (V) convertView.getTag();
                     }
-                    simpleAdapterSettings.setData(simpleViewHolder, simpleData, i);
+                    simpleAdapterSettings.setData(simpleViewHolder, simpleData, simpleDatas, i);
                 }
                 return convertView;
             case TYPE_MAP_DATA:
                 Map<String, Object> mapData = mapDatas.get(i);
-
+                
                 if (layoutResIdMap == null) {
                     if (layoutResId == -1) {
                         new Exception("请设置layoutResId或layoutResIdMap，至少设置其一");
@@ -205,7 +205,7 @@ public View getView(final int i, View convertView, ViewGroup viewGroup) {
                         } else {
                             viewHolder = convertView.getTag();
                         }
-                        simpleMapAdapterSettings.setData(viewHolder, mapData, i);
+                        simpleMapAdapterSettings.setData(viewHolder, mapData, mapDatas, i);
                     }
                 } else {
                     Object viewHolder = null;
@@ -217,27 +217,27 @@ public View getView(final int i, View convertView, ViewGroup viewGroup) {
                     } else {
                         viewHolder = convertView.getTag();
                     }
-                    multipleMapAdapterSettings.setData((Integer) mapData.get("type"), viewHolder, mapData, i);
+                    multipleMapAdapterSettings.setData((Integer) mapData.get("type"), viewHolder, mapData, mapDatas, i);
                 }
                 return convertView;
             default:
                 return null;
         }
     }
-
+    
     public static class BaseDataBean {
         public int type = 0;
-
+        
         public int getType() {
             return type;
         }
-
+        
         public BaseDataBean setType(int type) {
             this.type = type;
             return this;
         }
     }
-
+    
     public void refreshSimpleDataChanged(List<D> newDatas) {
         if (simpleDatas != null) {
             simpleDatas = new ArrayList<>();
@@ -245,7 +245,7 @@ public void refreshSimpleDataChanged(List<D> newDatas) {
             notifyDataSetChanged();
         }
     }
-
+    
     public void refreshMapDataChanged(List<Map<String, Object>> newDatas) {
         if (mapDatas != null) {
             mapDatas = new ArrayList<>();
@@ -253,7 +253,7 @@ public void refreshMapDataChanged(List<Map<String, Object>> newDatas) {
             notifyDataSetChanged();
         }
     }
-
+    
     public void refreshMultipleDataChanged(ArrayList<? extends BaseDataBean> newDatas) {
         if (multipleDatas != null) {
             multipleDatas = new ArrayList<>();
@@ -261,5 +261,5 @@ public void refreshMultipleDataChanged(ArrayList<? extends BaseDataBean> newData
             notifyDataSetChanged();
         }
     }
-
+    
 }
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java b/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java
index 6c64908..d32567d 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java
@@ -21,6 +21,7 @@
 import com.kongzue.baseframework.util.JumpParameter;
 import com.kongzue.baseframework.util.OnPermissionResponseListener;
 import com.kongzue.baseframework.util.OnJumpResponseListener;
+import com.kongzue.baseframework.util.ParameterCache;
 import com.kongzue.baseframework.util.toast.Toaster;
 
 import static com.kongzue.baseframework.BaseFrameworkSettings.DEBUGMODE;
@@ -37,11 +38,14 @@ public abstract class BaseFragment<ME extends BaseActivity> extends Fragment {
     
     public int layoutResId = -1;
     
-    private LifeCircleListener lifeCircleListener;          //快速管理生命周期
+    /**
+     * 快速管理生命周期
+     */
+    private LifeCircleListener lifeCircleListener;
     
     private Bundle savedInstanceState;
     
-    public ME me;                                                 //绑定的BaseActivity
+    public ME me;
     
     public void setActivity(ME activity) {
         this.me = activity;
@@ -50,8 +54,19 @@ public void setActivity(ME activity) {
     public BaseFragment() {
     }
     
-    public View rootView;       //根布局，可以直接用
+    /**
+     * 根布局，可以直接用
+     */
+    public View rootView;
     
+    /**
+     * 已完全取代 onCreateView 的使用，请勿重写此方法，要绑定布局请使用 @Layout(...) 注解
+     *
+     * @param inflater           忽略
+     * @param container          忽略
+     * @param savedInstanceState 忽略
+     * @return 忽略
+     */
     @Deprecated
     @Nullable
     @Override
@@ -74,7 +89,8 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
         }
         if (rootView == null) {
             rootView = LayoutInflater.from(getActivity()).inflate(layoutResId, container, false);
-            rootView.setClickable(true);        //防止点击穿透
+            //防止点击穿透
+            rootView.setClickable(true);
         }
         
         if (lifeCircleListener != null) {
@@ -97,20 +113,47 @@ public int getLayout() {
         return layoutResId;
     }
     
+    /**
+     * initViews会在启动时首先执行，建议在此方法内进行布局绑定、View初始化等操作
+     */
     public abstract void initViews();
     
+    /**
+     * initDatas会在布局加载后执行，建议在此方法内加载数据和处理布局显示数据
+     */
     public abstract void initDatas();
     
+    /**
+     * setEvents会在数据加载后执行，建议在此方法内绑定设置监听器、设置执行回调事件等操作
+     */
     public abstract void setEvents();
     
+    /**
+     * 重写此方法以替代 {@link #onResume()} 方法
+     * onLoad 会在首次进入此界面时执行
+     */
     public void onLoad() {
     
     }
     
+    /**
+     * 重写此方法以替代 {@link #onResume()} 方法
+     *
+     * @param isSwitchFragment 是否是从其他 BaseFragment 切换至此界面
+     */
     public void onShow(boolean isSwitchFragment) {
     
     }
     
+    /**
+     * 重写此方法以获取通过 jump(...) 跳转到此 BaseFragment 时携带的参数
+     *
+     * @param parameter 跳转时携带的参数
+     */
+    public void onParameterReceived(JumpParameter parameter) {
+    
+    }
+    
     public final <T extends View> T findViewById(@IdRes int id) {
         return rootView.findViewById(id);
     }
@@ -212,6 +255,102 @@ public boolean jump(Class<?> cls, JumpParameter jumpParameter, OnJumpResponseLis
         return me.jump(cls, jumpParameter, onJumpResponseListener, transitionView);
     }
     
+    /**
+     * 跳转到绑定在同一 BaseActivity 下指定角标的 BaseFragment
+     * @param index 角标
+     */
+    public void jump(int index) {
+        me.changeFragment(index);
+    }
+    
+    /**
+     * 跳转到绑定在同一 BaseActivity 下指定已实例化的 BaseFragment 对象
+     * @param baseFragment 指定的 BaseFragment 对象
+     */
+    public void jump(BaseFragment baseFragment) {
+        me.changeFragment(baseFragment);
+    }
+    
+    /**
+     * 转到绑定在同一 BaseActivity 下指定已实例化的 BaseFragment 对象，并携带要传递参数
+     * @param baseFragment 指定的 BaseFragment 对象
+     * @param parameter 要传递参数
+     */
+    public void jump(BaseFragment baseFragment, JumpParameter parameter) {
+        if (parameter != null) {
+            ParameterCache.getInstance().set(baseFragment.getClass().getName(), parameter);
+        }
+        me.changeFragment(baseFragment);
+    }
+    
+    /**
+     * 跳转到绑定在同一 BaseActivity 下指定角标的 BaseFragment，并携带要传递参数
+     * @param index 角标
+     * @param jumpParameter 要传递参数
+     */
+    public void jump(int index, JumpParameter jumpParameter) {
+        if (jumpParameter != null) {
+            ParameterCache.getInstance().set(me.getFragmentChangeUtil().getFragment(index).getClass().getName(), jumpParameter);
+        }
+        me.changeFragment(index);
+    }
+    
+    private OnJumpResponseListener onJumpResponseListener;
+    
+    /**
+     * 转到绑定在同一 BaseActivity 下指定已实例化的 BaseFragment 对象，并携带要传递参数和回调
+     * @param baseFragment 指定的 BaseFragment 对象
+     * @param jumpParameter 要传递参数
+     * @param onJumpResponseListener 回调
+     */
+    public void jump(BaseFragment baseFragment, JumpParameter jumpParameter, OnJumpResponseListener onJumpResponseListener) {
+        ParameterCache.getInstance().cleanResponse(this.getClass().getName());
+        if (jumpParameter == null) {
+            jumpParameter = new JumpParameter();
+        }
+        this.onJumpResponseListener = onJumpResponseListener;
+        ParameterCache.getInstance().set(baseFragment.getClass().getName(),
+                jumpParameter.put("needResponse", true).put("responseClassName", this.getClass().getName())
+        );
+        me.changeFragment(baseFragment);
+    }
+    
+    /**
+     * 跳转到绑定在同一 BaseActivity 下指定角标的 BaseFragment，并携带要传递参数和回调
+     * @param index 角标
+     * @param jumpParameter 要传递参数
+     * @param onJumpResponseListener 回调
+     */
+    public void jump(int index, JumpParameter jumpParameter, OnJumpResponseListener onJumpResponseListener) {
+        ParameterCache.getInstance().cleanResponse(this.getClass().getName());
+        if (jumpParameter == null) {
+            jumpParameter = new JumpParameter();
+        }
+        this.onJumpResponseListener = onJumpResponseListener;
+        ParameterCache.getInstance().set(me.getFragmentChangeUtil().getFragment(index).getClass().getName(),
+                jumpParameter.put("needResponse", true).put("responseClassName", this.getClass().getName())
+        );
+        me.changeFragment(index);
+    }
+    
+    //目标Fragment：设定要返回的数据
+    public void setFragmentResponse(JumpParameter jumpParameter) {
+        ParameterCache.getInstance().setResponse((String) getFragmentParameter().get("responseClassName"), jumpParameter);
+    }
+    
+    public JumpParameter getFragmentParameter() {
+        JumpParameter jumpParameter = ParameterCache.getInstance().get(this.getClass().getName());
+        if (jumpParameter == null) {
+            jumpParameter = new JumpParameter();
+        }
+        return jumpParameter;
+    }
+    
+    //目标Fragment：设定要返回的数据，写法2
+    public void returnFragmentParameter(JumpParameter parameter) {
+        setFragmentResponse(parameter);
+    }
+    
     //大型打印使用，Log默认是有字数限制的，如有需要打印更长的文本可以使用此方法
     public void bigLog(String msg) {
         me.bigLog(msg);
@@ -262,17 +401,34 @@ public void runDelayed(Runnable runnable, long time) {
         me.runDelayed(runnable, time);
     }
     
-    //复制文本到剪贴板
+    /**
+     * 复制文本到剪贴板
+     *
+     * @param s 要复制的文本
+     * @return 是否成功复制
+     */
     public boolean copy(String s) {
         return me.copy(s);
     }
     
-    //软键盘打开与收起
+    /**
+     * 软键盘打开与收起
+     *
+     * @param show     打开还是关闭
+     * @param editText 必须依赖一个 EditText
+     */
     public void setIMMStatus(boolean show, EditText editText) {
-        me.setIMMStatus(show, editText);
+        me.showIME(show, editText);
     }
     
+    /**
+     * 不推荐使用 onResume
+     * 建议使用 {@link #onLoad()} 或 {@link #onShow(boolean)} 代替。
+     * {@link #onLoad()} 仅会在第一次显示时执行一次
+     * {@link #onShow(boolean)} 会在每次恢复显示时执行，其参数 isSwitchFragment 用于判断是否是从其他 Fragment 切换到本界面
+     */
     @Override
+    @Deprecated
     public void onResume() {
         super.onResume();
         if (isCallShow) {
@@ -285,6 +441,21 @@ public void onResume() {
         }
         if (isLoaded) {
             onShow(isCallShow);
+            
+            if (isCallShow) {
+                JumpParameter jumpParameter = ParameterCache.getInstance().get(this.getClass().getName());
+                if (jumpParameter != null) {
+                    onParameterReceived(jumpParameter);
+                }
+                if (onJumpResponseListener != null) {
+                    JumpParameter responseData = ParameterCache.getInstance().getResponse(this.getClass().getName());
+                    if (responseData == null) {
+                        responseData = new JumpParameter();
+                    }
+                    onJumpResponseListener.OnResponse(responseData);
+                    onJumpResponseListener = null;
+                }
+            }
         }
         isCallShow = false;
         if (lifeCircleListener != null) {
@@ -295,7 +466,7 @@ public void onResume() {
     @Override
     public void onPause() {
         if (lifeCircleListener != null) {
-            lifeCircleListener.onResume();
+            lifeCircleListener.onPause();
         }
         super.onPause();
     }
@@ -308,6 +479,13 @@ public void onDestroy() {
         super.onDestroy();
     }
     
+    /**
+     * 重写此方法以判断当 Fragment 被切换时触发，请注意此时界面可能被暂停
+     */
+    public void onHide(){
+        ParameterCache.getInstance().cleanParameter(this.getClass().getName());
+    }
+    
     //使用默认浏览器打开链接
     public boolean openUrl(String url) {
         try {
@@ -385,6 +563,9 @@ public int getColorS(@ColorRes int id) {
     private boolean isLoaded = false;
     private boolean isCallShow = false;
     
+    /**
+     * 此方法是自动执行的，请勿调用
+     */
     public void callShow() {
         isCallShow = true;
         if (rootView != null) {
@@ -398,8 +579,12 @@ public void setAdded(boolean isAdded) {
         mAdded = isAdded;
     }
     
-    //1.isAdded() 根本不靠谱，时而返回 false 搞事情...
-    //2.傻X Google竟然把 isAdded() 给final掉了，无奈改个名字吧
+    /**
+     * 1.isAdded() 根本不靠谱，时而返回 false 搞事情...
+     * 2.傻X Google竟然把 isAdded() 给final掉了，无奈改个名字吧
+     *
+     * @return 是否已经被绑定到 FragmentManager
+     */
     public boolean isAddedCompat() {
         return mAdded;
     }
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/BaseFrameworkSettings.java b/baseframework/src/main/java/com/kongzue/baseframework/BaseFrameworkSettings.java
index 3feacef..ca7a300 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/BaseFrameworkSettings.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/BaseFrameworkSettings.java
@@ -38,7 +38,7 @@ public static void turnOnReadErrorInfoPermissions(Context context, OnBugReportLi
         String reporterFile = Preferences.getInstance().getString(context, "cache", "bugReporterFile");
         if (reporterFile != null && !reporterFile.isEmpty()) {
             onBugReportListener.onReporter(new File(reporterFile));
-            Preferences.getInstance().set(context, "cache", "bugReporterFile", "");
+            Preferences.getInstance().commit(context, "cache", "bugReporterFile", "");
         }
         
         Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
@@ -63,4 +63,4 @@ private static void showInfo(Throwable e) {
     }
     
     public static boolean setNavigationBarHeightZero = false;
-}
+}
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/interfaces/FragmentLayout.java b/baseframework/src/main/java/com/kongzue/baseframework/interfaces/FragmentLayout.java
new file mode 100644
index 0000000..f35fa70
--- /dev/null
+++ b/baseframework/src/main/java/com/kongzue/baseframework/interfaces/FragmentLayout.java
@@ -0,0 +1,21 @@
+package com.kongzue.baseframework.interfaces;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author: Kongzue
+ * @github: https://github.com/kongzue/
+ * @homepage: http://kongzue.com/
+ * @mail: myzcxhh@live.cn
+ * @createTime: 2019/8/22 20:58
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface FragmentLayout {
+    int value() default -1;
+}
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/interfaces/GlobalLifeCircleListener.java b/baseframework/src/main/java/com/kongzue/baseframework/interfaces/GlobalLifeCircleListener.java
index a13073e..130bc1f 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/interfaces/GlobalLifeCircleListener.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/interfaces/GlobalLifeCircleListener.java
@@ -22,4 +22,4 @@ public abstract class GlobalLifeCircleListener {
     public void WindowFocus(BaseActivity me, String className, boolean hasFocus) {
     
     }
-}
+}
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/interfaces/MultipleAdapterSettings.java b/baseframework/src/main/java/com/kongzue/baseframework/interfaces/MultipleAdapterSettings.java
index ec50ef7..7ad760d 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/interfaces/MultipleAdapterSettings.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/interfaces/MultipleAdapterSettings.java
@@ -10,5 +10,5 @@
 public interface MultipleAdapterSettings<D> {
     Object setViewHolder(int type, View convertView);
     
-    void setData(int type, Object vh, D data,int index);
+    void setData(int type, Object vh, D data, List<D> dataList,int index);
 }
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/interfaces/MultipleMapAdapterSettings.java b/baseframework/src/main/java/com/kongzue/baseframework/interfaces/MultipleMapAdapterSettings.java
index be9b325..c30109b 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/interfaces/MultipleMapAdapterSettings.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/interfaces/MultipleMapAdapterSettings.java
@@ -4,10 +4,11 @@
 
 import com.kongzue.baseframework.BaseAdapter;
 
+import java.util.List;
 import java.util.Map;
 
 public interface MultipleMapAdapterSettings {
     Object setViewHolder(int type, View convertView);
     
-    void setData(int type, Object vh, Map<String, Object> data,int index);
+    void setData(int type, Object vh, Map<String, Object> data, List<Map<String, Object>> dataList, int index);
 }
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/interfaces/OnFragmentChangeListener.java b/baseframework/src/main/java/com/kongzue/baseframework/interfaces/OnFragmentChangeListener.java
new file mode 100644
index 0000000..8c3c3b9
--- /dev/null
+++ b/baseframework/src/main/java/com/kongzue/baseframework/interfaces/OnFragmentChangeListener.java
@@ -0,0 +1,16 @@
+package com.kongzue.baseframework.interfaces;
+
+import com.kongzue.baseframework.BaseFragment;
+
+/**
+ * @author: Kongzue
+ * @github: https://github.com/kongzue/
+ * @homepage: http://kongzue.com/
+ * @mail: myzcxhh@live.cn
+ * @createTime: 2019/8/21 12:28
+ */
+public interface OnFragmentChangeListener {
+    
+    void onChange(int index, BaseFragment fragment);
+    
+}
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/interfaces/SimpleAdapterSettings.java b/baseframework/src/main/java/com/kongzue/baseframework/interfaces/SimpleAdapterSettings.java
index 3c3b3f1..c600d4c 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/interfaces/SimpleAdapterSettings.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/interfaces/SimpleAdapterSettings.java
@@ -4,8 +4,10 @@
 
 import com.kongzue.baseframework.BaseAdapter;
 
+import java.util.List;
+
 public interface SimpleAdapterSettings<V, D> {
     V setViewHolder(View convertView);
-
-    void setData(V viewHolder, D data, int index);
+    
+    void setData(V viewHolder, D data, List<D> dataList, int index);
 }
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/interfaces/SimpleMapAdapterSettings.java b/baseframework/src/main/java/com/kongzue/baseframework/interfaces/SimpleMapAdapterSettings.java
index f9ed03e..0a2a15b 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/interfaces/SimpleMapAdapterSettings.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/interfaces/SimpleMapAdapterSettings.java
@@ -4,10 +4,11 @@
 
 import com.kongzue.baseframework.BaseAdapter;
 
+import java.util.List;
 import java.util.Map;
 
 public interface SimpleMapAdapterSettings<V> {
     V setViewHolder(View convertView);
     
-    void setData(V viewHolder, Map<String, Object> data,int index);
-}
+    void setData(V viewHolder, Map<String, Object> data, List<Map<String, Object>> dataList, int index);
+}
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/AppManager.java b/baseframework/src/main/java/com/kongzue/baseframework/util/AppManager.java
index 460da67..7ff70e5 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/util/AppManager.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/util/AppManager.java
@@ -75,7 +75,9 @@ public void finishActivity() {
      */
     public void killActivity(BaseActivity activity) {
         if (activity != null) {
-            activity.finishActivity();
+            if (activity != null) {
+                activity.finishActivity();
+            }
             activityStack.remove(activity);
             activity = null;
         }
@@ -89,7 +91,7 @@ public void killActivity(Class<?> cls) {
         BaseActivity temp = null;
         while (iterator.hasNext()) {
             BaseActivity activity = iterator.next();
-            if (activity.getClass().equals(cls)) {
+            if (activity != null && activity.getClass().equals(cls)) {
                 temp = activity;
             }
         }
@@ -118,8 +120,7 @@ public void killAllActivity() {
     public void exit(Context context) {
         try {
             killAllActivity();
-            android.app.ActivityManager activityMgr = (android.app.ActivityManager) context
-                    .getSystemService(Context.ACTIVITY_SERVICE);
+            android.app.ActivityManager activityMgr = (android.app.ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
             activityMgr.killBackgroundProcesses(context.getPackageName());
             System.exit(0);
         } catch (Exception e) {
@@ -127,7 +128,7 @@ public void exit(Context context) {
     }
     
     @Deprecated
-    public void AppExit(Context context){
+    public void AppExit(Context context) {
         exit(context);
     }
     
@@ -151,14 +152,18 @@ public void deleteActivity(BaseActivity activity) {
     public void killOtherActivityExclude(Class<?>... cls) {
         List<Class<?>> excludeList = Arrays.asList(cls);
         if (activityStack != null) {
-            Iterator<BaseActivity> iterator = activityStack.iterator();
+            Stack<BaseActivity> activityStackCache = new Stack<>();
+            activityStackCache.addAll(activityStack);
+            Iterator<BaseActivity> iterator = activityStackCache.iterator();
             while (iterator.hasNext()) {
-                Activity activity = iterator.next();
-                if (excludeList.contains(activity.getClass())) {
+                BaseActivity activity = iterator.next();
+                if (activity != null && excludeList.contains(activity.getClass())) {
                     continue;
                 }
                 iterator.remove();
-                activity.finish();
+                if (activity != null) {
+                    activity.finish();
+                }
             }
         }
     }
@@ -177,7 +182,7 @@ public BaseActivity getActivityInstance(Class<?> cls) {
             BaseActivity temp = null;
             while (iterator.hasNext()) {
                 BaseActivity activity = iterator.next();
-                if (activity.getClass().equals(cls)) {
+                if (activity != null && activity.getClass().equals(cls)) {
                     temp = activity;
                 }
             }
@@ -211,4 +216,4 @@ public interface OnActivityStatusChangeListener {
         
         void onAllActivityClose();
     }
-}
+}
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/DebugLogG.java b/baseframework/src/main/java/com/kongzue/baseframework/util/DebugLogG.java
index 8de03a7..eaf24bc 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/util/DebugLogG.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/util/DebugLogG.java
@@ -45,13 +45,13 @@ public static void createWriter(Context context) {
             logWriter = new FileWriter(logFile, true);
             
             logWriter.write("App.Start===============" +
-                                    "\npackageName>>>" + context.getPackageName() +
-                                    "\nappVer>>>" + context.getPackageManager().getPackageInfo(context.getPackageName(), 0).versionName + "(" + context.getPackageManager().getPackageInfo(context.getPackageName(), 0).versionCode + ")" +
-                                    "\nmanufacturer>>>" + android.os.Build.BRAND.toLowerCase() +
-                                    "\nmodel>>>" + android.os.Build.MODEL.toLowerCase() +
-                                    "\nos-ver>>>" + android.os.Build.VERSION.RELEASE.toLowerCase() +
-                                    "\nandroidId>>>" + android.provider.Settings.System.getString(context.getContentResolver(), android.provider.Settings.System.ANDROID_ID) +
-                                    "\n\nLog.Start===============\n"
+                    "\npackageName>>>" + context.getPackageName() +
+                    "\nappVer>>>" + context.getPackageManager().getPackageInfo(context.getPackageName(), 0).versionName + "(" + context.getPackageManager().getPackageInfo(context.getPackageName(), 0).versionCode + ")" +
+                    "\nmanufacturer>>>" + android.os.Build.BRAND.toLowerCase() +
+                    "\nmodel>>>" + android.os.Build.MODEL.toLowerCase() +
+                    "\nos-ver>>>" + android.os.Build.VERSION.RELEASE.toLowerCase() +
+                    "\nandroidId>>>" + android.provider.Settings.System.getString(context.getContentResolver(), android.provider.Settings.System.ANDROID_ID) +
+                    "\n\nLog.Start===============\n"
             );
             logWriter.close();
         } catch (Exception e) {
@@ -75,4 +75,4 @@ public static String getExceptionInfo(Throwable e) {
         sw.flush();
         return sw.toString();
     }
-}
+}
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/FragmentChangeUtil.java b/baseframework/src/main/java/com/kongzue/baseframework/util/FragmentChangeUtil.java
index a8f1895..5fe750a 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/util/FragmentChangeUtil.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/util/FragmentChangeUtil.java
@@ -1,14 +1,20 @@
 package com.kongzue.baseframework.util;
 
+import android.util.Log;
+
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentTransaction;
 
 import com.kongzue.baseframework.BaseActivity;
 import com.kongzue.baseframework.BaseFragment;
+import com.kongzue.baseframework.interfaces.OnFragmentChangeListener;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import static com.kongzue.baseframework.BaseActivity.isNull;
+import static com.kongzue.baseframework.BaseFrameworkSettings.DEBUGMODE;
+
 /**
  * Author: @Kongzue
  * Github: https://github.com/kongzue/
@@ -18,6 +24,8 @@
  */
 public class FragmentChangeUtil {
     
+    private OnFragmentChangeListener onFragmentChangeListener;
+    
     private BaseActivity me;
     private List<BaseFragment> fragmentList;
     private BaseFragment focusFragment;
@@ -38,20 +46,16 @@ public FragmentChangeUtil build(BaseActivity me, int frameLayoutResId) {
     }
     
     public FragmentChangeUtil addFragment(BaseFragment fragment) {
-        if (me == null || frameLayoutResId == 0 || fragmentList == null) {
-            me.log("错误：请先执行 build(...) 方法初始化 FragmentChangeUtil");
-            return null;
-        }
-        fragmentList.add(fragment);
+        addFragment(fragment, true);
         return this;
     }
     
-    public FragmentChangeUtil addFragment(BaseFragment fragment,boolean isPreload) {
+    public FragmentChangeUtil addFragment(BaseFragment fragment, boolean isPreload) {
         if (me == null || frameLayoutResId == 0 || fragmentList == null) {
-            me.log("错误：请先执行 build(...) 方法初始化 FragmentChangeUtil");
+            log("错误：请先执行 build(...) 方法初始化 FragmentChangeUtil");
             return null;
         }
-        if (isPreload){
+        if (isPreload) {
             me.getSupportFragmentManager().beginTransaction().add(frameLayoutResId, fragment).commit();
             me.getSupportFragmentManager().beginTransaction().hide(fragment).commit();
             fragment.setAdded(true);
@@ -62,22 +66,26 @@ public FragmentChangeUtil addFragment(BaseFragment fragment,boolean isPreload) {
     
     public FragmentChangeUtil show(BaseFragment fragment) {
         if (me == null || frameLayoutResId == 0 || fragmentList == null) {
-            me.log("错误：请先执行build(...)方法初始化FragmentChangeUtil");
+            log("错误：请先执行build(...)方法初始化FragmentChangeUtil");
             return null;
         }
         if (!fragmentList.contains(fragment)) {
-            me.log("错误：请先执行 addFragment(fragment) 方法将此 Fragment 添加进 FragmentChangeUtil");
+            log("错误：请先执行 addFragment(fragment) 方法将此 Fragment 添加进 FragmentChangeUtil");
             return null;
         }
         FragmentTransaction transaction = me.getSupportFragmentManager().beginTransaction();
         if (focusFragment != null) {
+            focusFragment.onHide();
             transaction.hide(focusFragment);
         }
         
-        if (!fragment.isAddedCompat()){
+        if (!fragment.isAddedCompat()) {
             transaction.add(frameLayoutResId, fragment);
-        }else{
+        } else {
             transaction.show(fragment);
+            if (onFragmentChangeListener != null) {
+                onFragmentChangeListener.onChange(fragmentList.indexOf(fragment), fragment);
+            }
         }
         
         transaction.commit();
@@ -88,17 +96,21 @@ public FragmentChangeUtil show(BaseFragment fragment) {
     
     public FragmentChangeUtil show(int index) {
         if (me == null || frameLayoutResId == 0 || fragmentList == null) {
-            me.log("错误：请先执行build(...)方法初始化FragmentChangeUtil");
+            log("错误：请先执行build(...)方法初始化FragmentChangeUtil");
             return null;
         }
         FragmentTransaction transaction = me.getSupportFragmentManager().beginTransaction();
         if (focusFragment != null) {
+            focusFragment.onHide();
             transaction.hide(focusFragment);
         }
         
-        if (!fragmentList.get(index).isAddedCompat()){
+        if (!fragmentList.get(index).isAddedCompat()) {
             transaction.add(frameLayoutResId, fragmentList.get(index));
-        }else{
+        } else {
+            if (onFragmentChangeListener != null) {
+                onFragmentChangeListener.onChange(index, fragmentList.get(index));
+            }
             transaction.show(fragmentList.get(index));
         }
         
@@ -110,14 +122,15 @@ public FragmentChangeUtil show(int index) {
     
     public FragmentChangeUtil hide(int index) {
         if (me == null || frameLayoutResId == 0 || fragmentList == null) {
-            me.log("错误：请先执行build(...)方法初始化FragmentChangeUtil");
+            log("错误：请先执行build(...)方法初始化FragmentChangeUtil");
             return null;
         }
         FragmentTransaction transaction = me.getSupportFragmentManager().beginTransaction();
         
-        if (!fragmentList.get(index).isAddedCompat()){
+        if (!fragmentList.get(index).isAddedCompat()) {
             transaction.add(frameLayoutResId, fragmentList.get(index));
         }
+        fragmentList.get(index).onHide();
         transaction.hide(fragmentList.get(index));
         
         transaction.commit();
@@ -126,11 +139,11 @@ public FragmentChangeUtil hide(int index) {
     
     public FragmentChangeUtil hideNow() {
         if (me == null || frameLayoutResId == 0 || fragmentList == null) {
-            me.log("错误：请先执行build(...)方法初始化FragmentChangeUtil");
+            log("错误：请先执行build(...)方法初始化FragmentChangeUtil");
             return null;
         }
         FragmentTransaction transaction = me.getSupportFragmentManager().beginTransaction();
-        
+        focusFragment.onHide();
         transaction.hide(focusFragment);
         
         transaction.commit();
@@ -139,15 +152,16 @@ public FragmentChangeUtil hideNow() {
     
     public FragmentChangeUtil hide(BaseFragment fragment) {
         if (me == null || frameLayoutResId == 0 || fragmentList == null) {
-            me.log("错误：请先执行build(...)方法初始化FragmentChangeUtil");
+            log("错误：请先执行build(...)方法初始化FragmentChangeUtil");
             return null;
         }
         FragmentTransaction transaction = me.getSupportFragmentManager().beginTransaction();
         
         
-        if (!fragment.isAddedCompat()){
+        if (!fragment.isAddedCompat()) {
             transaction.add(frameLayoutResId, fragment);
         }
+        fragment.onHide();
         transaction.hide(fragment);
         
         transaction.commit();
@@ -156,12 +170,12 @@ public FragmentChangeUtil hide(BaseFragment fragment) {
     
     public FragmentChangeUtil remove(BaseFragment fragment) {
         if (me == null || frameLayoutResId == 0 || fragmentList == null) {
-            me.log("错误：请先执行build(...)方法初始化FragmentChangeUtil");
+            log("错误：请先执行build(...)方法初始化FragmentChangeUtil");
             return null;
         }
         FragmentTransaction transaction = me.getSupportFragmentManager().beginTransaction();
         
-        if (fragment.isAddedCompat()){
+        if (fragment.isAddedCompat()) {
             transaction.remove(fragment);
         }
         fragment.setAdded(false);
@@ -173,7 +187,7 @@ public FragmentChangeUtil remove(BaseFragment fragment) {
     
     public int getCount() {
         if (fragmentList == null) {
-            me.log("错误：请先执行build(...)方法初始化FragmentChangeUtil");
+            log("错误：请先执行build(...)方法初始化FragmentChangeUtil");
             return -1;
         }
         return fragmentList.size();
@@ -185,9 +199,45 @@ public Fragment getFocusFragment() {
     
     public int getFocusFragmentIndex() {
         if (fragmentList == null) {
-            me.log("错误：请先执行build(...)方法初始化FragmentChangeUtil");
+            log("错误：请先执行build(...)方法初始化FragmentChangeUtil");
             return -1;
         }
         return fragmentList.indexOf(focusFragment);
     }
-}
+    
+    //简易Log
+    public void log(final Object obj) {
+        try {
+            if (DEBUGMODE) {
+                String msg = obj.toString();
+                if (isNull(msg)) {
+                    return;
+                }
+                Log.v(">>>>>>", msg);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+    
+    public BaseFragment getFragment(int index) {
+        if (me == null || frameLayoutResId == 0 || fragmentList == null) {
+            log("错误：请先执行build(...)方法初始化FragmentChangeUtil");
+            return null;
+        }
+        if (fragmentList.size() < (index + 1)) {
+            log("错误：要获取的 index=" + index + " 超出了已添加的列表范围：" + fragmentList.size());
+            return null;
+        }
+        return fragmentList.get(index);
+    }
+    
+    public OnFragmentChangeListener getOnFragmentChangeListener() {
+        return onFragmentChangeListener;
+    }
+    
+    public FragmentChangeUtil setOnFragmentChangeListener(OnFragmentChangeListener onFragmentChangeListener) {
+        this.onFragmentChangeListener = onFragmentChangeListener;
+        return this;
+    }
+}
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/JumpParameter.java b/baseframework/src/main/java/com/kongzue/baseframework/util/JumpParameter.java
index 4e32c85..26ac63a 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/util/JumpParameter.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/util/JumpParameter.java
@@ -34,6 +34,13 @@ public boolean getBoolean(String key) {
         return (boolean) datas.get(key);
     }
     
+    public boolean getBoolean(String key, boolean defaultValue) {
+        if (datas == null || datas.get(key) == null) {
+            return defaultValue;
+        }
+        return (boolean) datas.get(key);
+    }
+    
     public int getInt(String key) {
         if (datas == null || datas.get(key) == null) {
             return 0;
@@ -41,6 +48,13 @@ public int getInt(String key) {
         return (int) datas.get(key);
     }
     
+    public int getInt(String key, int defaultValue) {
+        if (datas == null || datas.get(key) == null) {
+            return defaultValue;
+        }
+        return (int) datas.get(key);
+    }
+    
     public String getString(String key) {
         if (datas == null || datas.get(key) == null) {
             return "";
@@ -48,6 +62,13 @@ public String getString(String key) {
         return (String) datas.get(key);
     }
     
+    public String getString(String key, String defaultValue) {
+        if (datas == null || datas.get(key) == null) {
+            return defaultValue;
+        }
+        return (String) datas.get(key);
+    }
+    
     public double getDouble(String key) {
         if (datas == null || datas.get(key) == null) {
             return 0;
@@ -55,6 +76,13 @@ public double getDouble(String key) {
         return (double) datas.get(key);
     }
     
+    public double getDouble(String key, double defaultValue) {
+        if (datas == null || datas.get(key) == null) {
+            return defaultValue;
+        }
+        return (double) datas.get(key);
+    }
+    
     public long getLong(String key) {
         if (datas == null || datas.get(key) == null) {
             return 0;
@@ -62,6 +90,13 @@ public long getLong(String key) {
         return (long) datas.get(key);
     }
     
+    public long getLong(String key, long defaultValue) {
+        if (datas == null || datas.get(key) == null) {
+            return defaultValue;
+        }
+        return (long) datas.get(key);
+    }
+    
     public short getShort(String key) {
         if (datas == null || datas.get(key) == null) {
             return 0;
@@ -69,6 +104,13 @@ public short getShort(String key) {
         return (short) datas.get(key);
     }
     
+    public short getShort(String key, short defaultValue) {
+        if (datas == null || datas.get(key) == null) {
+            return defaultValue;
+        }
+        return (short) datas.get(key);
+    }
+    
     public float getFloat(String key) {
         if (datas == null || datas.get(key) == null) {
             return 0;
@@ -76,7 +118,14 @@ public float getFloat(String key) {
         return (float) datas.get(key);
     }
     
+    public float getFloat(String key, float defaultValue) {
+        if (datas == null || datas.get(key) == null) {
+            return defaultValue;
+        }
+        return (float) datas.get(key);
+    }
+    
     public Map<String, Object> getAll() {
         return datas;
     }
-}
+}
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/ParameterCache.java b/baseframework/src/main/java/com/kongzue/baseframework/util/ParameterCache.java
index da541f2..94297c3 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/util/ParameterCache.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/util/ParameterCache.java
@@ -3,13 +3,17 @@
 import java.util.HashMap;
 import java.util.Map;
 
+/**
+ * 数据传递的中间人
+ * 本类负责缓存数据，承担 BaseActivity、BaseFragment 之间数据传输的缓存角色
+ */
 public class ParameterCache {
-
+    
     private static ParameterCache parameterCache;
-
+    
     private ParameterCache() {
     }
-
+    
     public static ParameterCache getInstance() {
         if (parameterCache == null) {
             synchronized (ParameterCache.class) {
@@ -20,46 +24,51 @@ public static ParameterCache getInstance() {
         }
         return parameterCache;
     }
-
+    
     private Map<String, JumpParameter> parameterList;
-
+    
     public JumpParameter get(String className) {
         if (parameterList == null) {
             return null;
         }
         return parameterList.get(className);
     }
-
+    
     public void set(String className, JumpParameter jumpParameter) {
         if (parameterList == null) {
             parameterList = new HashMap<>();
         }
         parameterList.put(className, jumpParameter);
     }
-
-
+    
+    
     private Map<String, JumpParameter> parameterResponseList;
-
+    
     public JumpParameter getResponse(String className) {
         if (parameterResponseList == null) {
             return null;
         }
         return parameterResponseList.get(className);
     }
-
+    
     public void setResponse(String className, JumpParameter jumpParameter) {
         if (parameterResponseList == null) {
             parameterResponseList = new HashMap<>();
         }
         parameterResponseList.put(className, jumpParameter);
     }
-
+    
     public void cleanResponse(String className) {
         if (parameterResponseList == null) {
             return;
         }
         parameterResponseList.put(className, null);
     }
-
-
-}
+    
+    public void cleanParameter(String className) {
+        if (parameterList == null) {
+            return;
+        }
+        parameterList.put(className, null);
+    }
+}
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/Preferences.java b/baseframework/src/main/java/com/kongzue/baseframework/util/Preferences.java
index df1785d..2c48530 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/util/Preferences.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/util/Preferences.java
@@ -10,13 +10,12 @@
  */
 
 public class Preferences {
-
-    //本类采用单例设计模式，请使用getInstance()获取本类对象后进行使用
+    
     private static Preferences preferences;
-
+    
     private Preferences() {
     }
-
+    
     public static Preferences getInstance() {
         if (preferences == null) {
             synchronized (Preferences.class) {
@@ -27,56 +26,129 @@ public static Preferences getInstance() {
         }
         return preferences;
     }
-
-    //读取属性为String类型
-    //参数：context上下文索引，path路径，preferencesName属性名
     
+    /**
+     * 读取属性为String类型
+     *
+     * @param context 上下文索引
+     * @param path 路径
+     * @param preferencesName 属性名
+     * @return String
+     */
     public String getString(Context context, String path, String preferencesName){
         return getString(context,path,preferencesName,"");
     }
     
+    /**
+     * 读取属性为Boolean类型
+     *
+     * @param context 上下文索引
+     * @param path 路径
+     * @param preferencesName 属性名
+     * @return Boolean
+     */
     public boolean getBoolean(Context context, String path, String preferencesName){
         return getBoolean(context,path,preferencesName,false);
     }
     
+    /**
+     * 读取属性为Int类型
+     *
+     * @param context 上下文索引
+     * @param path 路径
+     * @param preferencesName 属性名
+     * @return Int
+     */
     public int getInt(Context context, String path, String preferencesName){
         return getInt(context,path,preferencesName,0);
     }
     
+    /**
+     * 读取属性为String类型
+     *
+     * @param context 上下文索引
+     * @param path 路径
+     * @param preferencesName 属性名
+     * @param defaultValue 默认值
+     * @return String
+     */
     public String getString(Context context, String path, String preferencesName,String defaultValue){
         SharedPreferences preferences = context.getSharedPreferences(path, Context.MODE_PRIVATE);
         String value = preferences.getString(preferencesName, defaultValue);
         return value;
     }
-
+    
+    /**
+     * 读取属性为Boolean类型
+     *
+     * @param context 上下文索引
+     * @param path 路径
+     * @param preferencesName 属性名
+     * @param defaultValue 默认值
+     * @return Boolean
+     */
     public boolean getBoolean(Context context, String path, String preferencesName,boolean defaultValue){
         SharedPreferences preferences = context.getSharedPreferences(path, Context.MODE_PRIVATE);
         boolean value = preferences.getBoolean(preferencesName, defaultValue);
         return value;
     }
-
+    
+    /**
+     * 读取属性为Int类型
+     *
+     * @param context 上下文索引
+     * @param path 路径
+     * @param preferencesName 属性名
+     * @param defaultValue 默认值
+     * @return Int
+     */
     public int getInt(Context context, String path, String preferencesName,int defaultValue){
         SharedPreferences preferences = context.getSharedPreferences(path, Context.MODE_PRIVATE);
         int value = preferences.getInt(preferencesName, defaultValue);
         return value;
     }
-
-    //写入属性方法
-    //参数：context上下文索引，path路径，preferencesName属性名，value根据属性数据类型定义
+    
+    /**
+     * 写入String属性方法，占用资源较少，但不会立即生效
+     *
+     * @param context 上下文索引
+     * @param path 路径
+     * @param preferencesName 属性名
+     * @param value 值
+     * @return none
+     */
     public void set(Context context, String path, String preferencesName,String value){
         SharedPreferences preferences = context.getSharedPreferences(path, Context.MODE_PRIVATE);
         SharedPreferences.Editor editor = preferences.edit();
         editor.putString(preferencesName, value);
         editor.apply();
     }
-
+    
+    /**
+     * 写入Boolean属性方法，占用资源较少，但不会立即生效
+     *
+     * @param context 上下文索引
+     * @param path 路径
+     * @param preferencesName 属性名
+     * @param value 值
+     * @return none
+     */
     public void set(Context context, String path, String preferencesName,boolean value){
         SharedPreferences preferences = context.getSharedPreferences(path, Context.MODE_PRIVATE);
         SharedPreferences.Editor editor = preferences.edit();
         editor.putBoolean(preferencesName, value);
         editor.apply();
     }
-
+    
+    /**
+     * 写入Int属性方法，占用资源较少，但不会立即生效
+     *
+     * @param context 上下文索引
+     * @param path 路径
+     * @param preferencesName 属性名
+     * @param value 值
+     * @return none
+     */
     public void set(Context context, String path, String preferencesName,int value){
         SharedPreferences preferences = context.getSharedPreferences(path, Context.MODE_PRIVATE);
         SharedPreferences.Editor editor = preferences.edit();
@@ -84,6 +156,15 @@ public void set(Context context, String path, String preferencesName,int value){
         editor.apply();
     }
     
+    /**
+     * 写入String属性方法，立即生效
+     *
+     * @param context 上下文索引
+     * @param path 路径
+     * @param preferencesName 属性名
+     * @param value 值
+     * @return none
+     */
     public void commit(Context context, String path, String preferencesName,String value){
         SharedPreferences preferences = context.getSharedPreferences(path, Context.MODE_PRIVATE);
         SharedPreferences.Editor editor = preferences.edit();
@@ -91,6 +172,15 @@ public void commit(Context context, String path, String preferencesName,String v
         editor.commit();
     }
     
+    /**
+     * 写入Boolean属性方法，立即生效
+     *
+     * @param context 上下文索引
+     * @param path 路径
+     * @param preferencesName 属性名
+     * @param value 值
+     * @return none
+     */
     public void commit(Context context, String path, String preferencesName,boolean value){
         SharedPreferences preferences = context.getSharedPreferences(path, Context.MODE_PRIVATE);
         SharedPreferences.Editor editor = preferences.edit();
@@ -98,19 +188,34 @@ public void commit(Context context, String path, String preferencesName,boolean
         editor.commit();
     }
     
+    /**
+     * 写入Int属性方法，立即生效
+     *
+     * @param context 上下文索引
+     * @param path 路径
+     * @param preferencesName 属性名
+     * @param value 值
+     * @return none
+     */
     public void commit(Context context, String path, String preferencesName,int value){
         SharedPreferences preferences = context.getSharedPreferences(path, Context.MODE_PRIVATE);
         SharedPreferences.Editor editor = preferences.edit();
         editor.putInt(preferencesName, value);
         editor.commit();
     }
-
-    //清除（清空）所有属性的方法
+    
+    /**
+     * 清除（清空）所有属性的方法
+     *
+     * @param context 上下文索引
+     * @param path 路径
+     * @return none
+     */
     public void cleanAll(Context context, String path){
         SharedPreferences sp=context.getSharedPreferences(path,Context.MODE_PRIVATE);
         if(sp!=null) {
             sp.edit().clear().apply();
         }
     }
-
+    
 }
\ No newline at end of file

From 2184d955757414e4a92a0206412eb404013a0e2b Mon Sep 17 00:00:00 2001
From: kongzue <myzcxhh@live.cn>
Date: Wed, 27 Nov 2019 18:16:10 +0800
Subject: [PATCH 04/18] 6.7.3 pub

---
 .idea/caches/build_file_checksums.ser         | Bin 592 -> 592 bytes
 .idea/gradle.xml                              |   4 +-
 baseframework/build.gradle                    |   2 +-
 .../kongzue/baseframework/BaseActivity.java   | 135 ++++++-
 .../com/kongzue/baseframework/BaseApp.java    | 357 ++++++++++++++++++
 .../kongzue/baseframework/BaseFragment.java   | 136 ++++++-
 .../baseframework/interfaces/BindView.java    |  19 +
 .../baseframework/interfaces/BindViews.java   |  19 +
 .../NavigationBarBackgroundColor.java         |   2 +-
 .../NavigationBarBackgroundColorHex.java      |  21 ++
 .../NavigationBarBackgroundColorInt.java      |  23 ++
 .../NavigationBarBackgroundColorRes.java      |  23 ++
 .../baseframework/interfaces/OnClick.java     |  19 +
 .../interfaces/OnSDKInitializedCallBack.java  |  14 +
 .../baseframework/util/AppManager.java        |  17 +-
 .../util/FragmentChangeUtil.java              |  63 +++-
 .../baseframework/util/JsonFormat.java        |   2 +-
 .../baseframework/util/JumpParameter.java     |   8 +
 .../baseframework/util/Preferences.java       | 151 ++++----
 .../layout/layout_baseframework_holder.xml    |  10 +
 20 files changed, 908 insertions(+), 117 deletions(-)
 create mode 100644 baseframework/src/main/java/com/kongzue/baseframework/BaseApp.java
 create mode 100644 baseframework/src/main/java/com/kongzue/baseframework/interfaces/BindView.java
 create mode 100644 baseframework/src/main/java/com/kongzue/baseframework/interfaces/BindViews.java
 create mode 100644 baseframework/src/main/java/com/kongzue/baseframework/interfaces/NavigationBarBackgroundColorHex.java
 create mode 100644 baseframework/src/main/java/com/kongzue/baseframework/interfaces/NavigationBarBackgroundColorInt.java
 create mode 100644 baseframework/src/main/java/com/kongzue/baseframework/interfaces/NavigationBarBackgroundColorRes.java
 create mode 100644 baseframework/src/main/java/com/kongzue/baseframework/interfaces/OnClick.java
 create mode 100644 baseframework/src/main/java/com/kongzue/baseframework/interfaces/OnSDKInitializedCallBack.java
 create mode 100644 baseframework/src/main/res/layout/layout_baseframework_holder.xml

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 3375b19b2e7e480ab3dc1c13fbae8b618d274c53..85615cb4d9bb36d4850d12efcaebccc058db146d 100644
GIT binary patch
delta 37
vcmV+=0NVf11kePKmj!ODR*#ploOJ;Z@<ViEUd>auRSMGQBRYSnlOX~xJkbyW

delta 37
vcmV+=0NVf11kePKmj!IOZ=9vEoOJ;ZW8OY5Or^Mwt^fW(m~k7IlOX~xNuv<%

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index fd241bf..d03de62 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,9 +3,6 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <compositeConfiguration>
-          <compositeBuild compositeDefinitionSource="SCRIPT" />
-        </compositeConfiguration>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
@@ -16,6 +13,7 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
+        <option name="testRunner" value="PLATFORM" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/baseframework/build.gradle b/baseframework/build.gradle
index b292bfe..ed5cfb5 100644
--- a/baseframework/build.gradle
+++ b/baseframework/build.gradle
@@ -90,6 +90,6 @@ bintray {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 }
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java b/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java
index c39c0a8..eb40b6a 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java
@@ -34,11 +34,14 @@
 import android.view.Display;
 import android.view.View;
 import android.view.Window;
+import android.view.WindowInsets;
 import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.Toast;
 
+import com.kongzue.baseframework.interfaces.BindView;
+import com.kongzue.baseframework.interfaces.BindViews;
 import com.kongzue.baseframework.interfaces.FragmentLayout;
 import com.kongzue.baseframework.interfaces.FullScreen;
 import com.kongzue.baseframework.interfaces.GlobalLifeCircleListener;
@@ -47,6 +50,10 @@
 import com.kongzue.baseframework.interfaces.DarkStatusBarTheme;
 import com.kongzue.baseframework.interfaces.Layout;
 import com.kongzue.baseframework.interfaces.NavigationBarBackgroundColor;
+import com.kongzue.baseframework.interfaces.NavigationBarBackgroundColorHex;
+import com.kongzue.baseframework.interfaces.NavigationBarBackgroundColorInt;
+import com.kongzue.baseframework.interfaces.NavigationBarBackgroundColorRes;
+import com.kongzue.baseframework.interfaces.OnClick;
 import com.kongzue.baseframework.interfaces.SwipeBack;
 import com.kongzue.baseframework.util.AppManager;
 import com.kongzue.baseframework.util.DebugLogG;
@@ -82,14 +89,6 @@
 import static com.kongzue.baseframework.BaseFrameworkSettings.DEBUGMODE;
 import static com.kongzue.baseframework.BaseFrameworkSettings.setNavigationBarHeightZero;
 
-/**
- * @Version: 6.7.0
- * @Author: Kongzue
- * @github: https://github.com/kongzue/BaseFramework
- * @link: http://kongzue.com/
- * @describe: 自动化代码流水线作业，以及对原生安卓、MIUI、flyme的透明状态栏显示灰色图标文字的支持，同时提供一些小工具简化开发难度，详细说明文档：https://github.com/kongzue/BaseFramework
- */
-
 /**
  * @Version: 6.7.0
  * @Author: Kongzue
@@ -139,10 +138,6 @@ protected void onCreate(Bundle savedInstanceState) {
             Log.e("警告！", "请在您的Activity的Class上注解：@Layout(你的layout资源id)");
             return;
         }
-        if (fragmentLayoutId != -1) {
-            fragmentChangeUtil = new FragmentChangeUtil(this, fragmentLayoutId);
-            initFragment(fragmentChangeUtil);
-        }
         
         setContentView(layoutResId);
         if (isFullScreen) {
@@ -154,6 +149,12 @@ protected void onCreate(Bundle savedInstanceState) {
         AppManager.getInstance().pushActivity(me);
         
         initViews();
+        if (fragmentLayoutId != -1) {
+            fragmentChangeUtil = new FragmentChangeUtil(this, fragmentLayoutId);
+            initFragment(fragmentChangeUtil);
+        }
+        bindAutoEvent();
+        initBindViewAndFunctions();
         initDatas(getParameter());
         setEvents();
         
@@ -165,6 +166,79 @@ protected void onCreate(Bundle savedInstanceState) {
         }
     }
     
+    protected void initBindViewAndFunctions() {
+        try {
+            Field[] fields = getClass().getDeclaredFields();
+            for (Field field : fields) {
+                if (field.isAnnotationPresent(BindView.class)) {
+                    BindView bindView = field.getAnnotation(BindView.class);
+                    if (bindView != null && bindView.value() != 0) {
+                        field.setAccessible(true);
+                        field.set(me, me.findViewById(bindView.value()));
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        try {
+            Field[] fields = getClass().getDeclaredFields();
+            for (Field field : fields) {
+                if (field.isAnnotationPresent(BindViews.class)) {
+                    BindViews bindView = field.getAnnotation(BindViews.class);
+                    if (bindView != null && bindView.value().length != 0) {
+                        List<View> viewList = new ArrayList<>();
+                        for (int id : bindView.value()) {
+                            viewList.add(findViewById(id));
+                        }
+                        field.setAccessible(true);
+                        field.set(me, viewList);
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        try {
+            Method[] methods = getClass().getDeclaredMethods();
+            for (Method method : methods) {
+                if (method.isAnnotationPresent(OnClick.class)) {
+                    OnClick onClick = method.getAnnotation(OnClick.class);
+                    if (onClick != null && onClick.value() != 0) {
+                        View v = findViewById(onClick.value());
+                        v.setOnClickListener(new View.OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+                                try {
+                                    method.invoke(me, v);
+                                } catch (Exception e) {
+                                    try {
+                                        method.invoke(me);
+                                    } catch (Exception e1) {
+                                    }
+                                }
+                            }
+                        });
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+    
+    private void bindAutoEvent() {
+        View backView = findViewById(R.id.back);
+        if (backView != null) {
+            backView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    onBackPressed();
+                }
+            });
+        }
+    }
+    
     public void setLifeCircleListener(LifeCircleListener lifeCircleListener) {
         this.lifeCircleListener = lifeCircleListener;
     }
@@ -179,6 +253,9 @@ private void initAttributes() {
             DarkNavigationBarTheme darkNavigationBarTheme = getClass().getAnnotation(DarkNavigationBarTheme.class);
             DarkStatusBarTheme darkStatusBarTheme = getClass().getAnnotation(DarkStatusBarTheme.class);
             NavigationBarBackgroundColor navigationBarBackgroundColor = getClass().getAnnotation(NavigationBarBackgroundColor.class);
+            NavigationBarBackgroundColorRes navigationBarBackgroundColorRes = getClass().getAnnotation(NavigationBarBackgroundColorRes.class);
+            NavigationBarBackgroundColorInt navigationBarBackgroundColorInt = getClass().getAnnotation(NavigationBarBackgroundColorInt.class);
+            NavigationBarBackgroundColorHex navigationBarBackgroundColorHex = getClass().getAnnotation(NavigationBarBackgroundColorHex.class);
             if (fullScreen != null) {
                 isFullScreen = fullScreen.value();
                 if (isFullScreen) {
@@ -210,6 +287,17 @@ private void initAttributes() {
                     navigationBarBackgroundColorValue = Color.argb(navigationBarBackgroundColor.a(), navigationBarBackgroundColor.r(), navigationBarBackgroundColor.g(), navigationBarBackgroundColor.b());
                 }
             }
+            if (navigationBarBackgroundColorRes != null) {
+                if (navigationBarBackgroundColorRes.value() != -1) {
+                    navigationBarBackgroundColorValue = getColorS(navigationBarBackgroundColorRes.value());
+                }
+            }
+            if (navigationBarBackgroundColorInt != null) {
+                navigationBarBackgroundColorValue = navigationBarBackgroundColorInt.value();
+            }
+            if (navigationBarBackgroundColorHex != null) {
+                navigationBarBackgroundColorValue = Color.parseColor(navigationBarBackgroundColorHex.value());
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -263,6 +351,12 @@ public void changeFragment(int index) {
         }
     }
     
+    public void changeFragment(int index, int enterAnimResId, int exitAnimResId) {
+        if (fragmentChangeUtil != null) {
+            fragmentChangeUtil.anim(enterAnimResId, exitAnimResId).show(index);
+        }
+    }
+    
     /**
      * 切换至指定 BaseFragment
      *
@@ -274,6 +368,12 @@ public void changeFragment(BaseFragment fragment) {
         }
     }
     
+    public void changeFragment(BaseFragment fragment, int enterAnimResId, int exitAnimResId) {
+        if (fragmentChangeUtil != null) {
+            fragmentChangeUtil.anim(enterAnimResId, exitAnimResId).show(fragment);
+        }
+    }
+    
     /**
      * 获取 FragmentChangeUtil 对象
      */
@@ -814,10 +914,13 @@ public int getDisplayHeight() {
     
     //获取底栏高度
     public int getNavbarHeight() {
-        if (setNavigationBarHeightZero) {
-            return 0;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            WindowInsets windowInsets = null;
+            windowInsets = getWindow().getDecorView().getRootView().getRootWindowInsets();
+            if (windowInsets != null) {
+                return windowInsets.getStableInsetBottom();
+            }
         }
-        int result = 0;
         int resourceId = 0;
         int rid = getResources().getIdentifier("config_showNavigationBar", "bool", "android");
         if (rid != 0) {
@@ -1139,7 +1242,7 @@ protected void onResume() {
         logG("\n" + me.getClass().getSimpleName(), "onResume");
         if (onResponseListener != null) {
             JumpParameter responseData = ParameterCache.getInstance().getResponse(me.getClass().getName());
-            if (responseData==null){
+            if (responseData == null) {
                 responseData = new JumpParameter();
             }
             onResponseListener.OnResponse(responseData);
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/BaseApp.java b/baseframework/src/main/java/com/kongzue/baseframework/BaseApp.java
new file mode 100644
index 0000000..1d872b3
--- /dev/null
+++ b/baseframework/src/main/java/com/kongzue/baseframework/BaseApp.java
@@ -0,0 +1,357 @@
+package com.kongzue.baseframework;
+
+import android.app.Application;
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.graphics.Point;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Handler;
+import android.os.Looper;
+import android.provider.Settings;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.Display;
+import android.view.WindowInsets;
+import android.view.WindowManager;
+import android.widget.Toast;
+
+import com.kongzue.baseframework.interfaces.OnSDKInitializedCallBack;
+import com.kongzue.baseframework.util.AppManager;
+import com.kongzue.baseframework.util.DebugLogG;
+import com.kongzue.baseframework.util.JsonFormat;
+import com.kongzue.baseframework.util.toast.Toaster;
+
+import java.lang.reflect.Field;
+
+import static com.kongzue.baseframework.BaseFrameworkSettings.BETA_PLAN;
+import static com.kongzue.baseframework.BaseFrameworkSettings.DEBUGMODE;
+import static com.kongzue.baseframework.BaseFrameworkSettings.setNavigationBarHeightZero;
+
+/**
+ * @author: Kongzue
+ * @github: https://github.com/kongzue/
+ * @homepage: http://kongzue.com/
+ * @mail: myzcxhh@live.cn
+ * @createTime: 2019/9/23 12:43
+ */
+public abstract class BaseApp<YourApp extends BaseApp> extends Application {
+    
+    private Handler mainHandler = new Handler(Looper.getMainLooper());
+    private OnSDKInitializedCallBack onSDKInitializedCallBack;
+    
+    private boolean isInitializedSDKs;
+    
+    public abstract void init();
+    
+    public void initSDKs() {
+    }
+    
+    public void initSDKInitialized() {
+    }
+    
+    public YourApp me;
+    
+    @Override
+    @Deprecated
+    public void onCreate() {
+        super.onCreate();
+        
+        me = (YourApp) this;
+        init();
+        new Thread() {
+            @Override
+            public void run() {
+                synchronized (me) {
+                    isInitializedSDKs = false;
+                    initSDKs();
+                    
+                    if (onSDKInitializedCallBack != null) {
+                        mainHandler.post(new Runnable() {
+                            @Override
+                            public void run() {
+                                initSDKInitialized();
+                                onSDKInitializedCallBack.onInitialized();
+                                isInitializedSDKs = true;
+                            }
+                        });
+                    }
+                }
+            }
+        }.start();
+    }
+    
+    public boolean isInitializedSDKs() {
+        return isInitializedSDKs;
+    }
+    
+    public BaseApp<YourApp> setOnSDKInitializedCallBack(OnSDKInitializedCallBack onSDKInitializedCallBack) {
+        this.onSDKInitializedCallBack = onSDKInitializedCallBack;
+        return this;
+    }
+    
+    public void log(final Object obj) {
+        try {
+            if (DEBUGMODE) {
+                String msg = obj.toString();
+                if (isNull(msg)) {
+                    return;
+                }
+                if (obj.toString().length() > 2048) {
+                    bigLog(msg);
+                } else {
+                    logG("log", msg);
+                    if (!JsonFormat.formatJson(msg)) {
+                        Log.v(">>>>>>", msg);
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+    
+    public void error(final Object obj) {
+        try {
+            if (DEBUGMODE) {
+                String msg = obj.toString();
+                if (isNull(msg)) {
+                    return;
+                }
+                if (obj.toString().length() > 2048) {
+                    bigLog(msg);
+                } else {
+                    logG("log", msg);
+                    if (!JsonFormat.formatJson(msg)) {
+                        Log.e(">>>>>>", msg);
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+    
+    public void bigLog(String msg) {
+        Log.i(">>>bigLog", "BIGLOG.start=================================");
+        if (isNull(msg)) {
+            return;
+        }
+        logG("log", msg);
+        int strLength = msg.length();
+        int start = 0;
+        int end = 2000;
+        for (int i = 0; i < 100; i++) {
+            //剩下的文本还是大于规定长度则继续重复截取并输出
+            if (strLength > end) {
+                Log.v(">>>", msg.substring(start, end));
+                start = end;
+                end = end + 2000;
+            } else {
+                Log.v(">>>", msg.substring(start, strLength));
+                break;
+            }
+        }
+        Log.i(">>>bigLog", "BIGLOG.end=================================");
+    }
+    
+    private void logG(String tag, Object o) {
+        if (BETA_PLAN) {
+            DebugLogG.LogG(me, tag + ">>>" + o.toString());
+        }
+    }
+    
+    protected final static String NULL = "";
+    private Toast toast;
+    
+    public void toast(final Object obj) {
+        try {
+            mainHandler.post(new Runnable() {
+                @Override
+                public void run() {
+                    logG("toast", obj.toString());
+                    if (toast == null) {
+                        toast = Toast.makeText(BaseApp.this, NULL, Toast.LENGTH_SHORT);
+                    }
+                    toast.setText(obj.toString());
+                    toast.show();
+                }
+            });
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+    
+    public void toastS(final Object obj) {
+        Toaster.build(me).show(obj.toString());
+    }
+    
+    public void runOnMain(Runnable runnable) {
+        mainHandler.post(new Runnable() {
+            @Override
+            public void run() {
+                runnable.run();
+            }
+        });
+    }
+    
+    public void runOnMainDelayed(Runnable runnable, long time) {
+        new Handler().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                runOnMain(runnable);
+            }
+        }, time);
+    }
+    
+    public void runDelayed(Runnable runnable, long time) {
+        new Handler().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                runnable.run();
+            }
+        }, time);
+    }
+    
+    //用于进行dip和px转换
+    public int dip2px(float dpValue) {
+        final float scale = getResources().getDisplayMetrics().density;
+        return (int) (dpValue * scale + 0.5f);
+    }
+    
+    //用于进行px和dip转换
+    public int px2dip(float pxValue) {
+        final float scale = getResources().getDisplayMetrics().density;
+        return (int) (pxValue / scale + 0.5f);
+    }
+    
+    
+    //启动当前应用设置页面
+    public void startAppSettings() {
+        Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+        intent.setData(Uri.parse("package:" + getPackageName()));
+        startActivity(intent);
+    }
+    
+    //获取状态栏的高度
+    public int getStatusBarHeight() {
+        try {
+            Class<?> c = Class.forName("com.android.internal.R$dimen");
+            Object obj = c.newInstance();
+            Field field = c.getField("status_bar_height");
+            int x = Integer.parseInt(field.get(obj).toString());
+            return getResources().getDimensionPixelSize(x);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return 0;
+    }
+    
+    //获取屏幕宽度
+    public int getDisplayWidth() {
+        WindowManager windowManager = (WindowManager) getSystemService(Context.WINDOW_SERVICE);
+        Display disp = windowManager.getDefaultDisplay();
+        Point outP = new Point();
+        disp.getSize(outP);
+        return outP.x;
+    }
+    
+    //获取屏幕可用部分高度（屏幕高度-状态栏高度-屏幕底栏高度）
+    public int getDisplayHeight() {
+        WindowManager windowManager = (WindowManager) getSystemService(Context.WINDOW_SERVICE);
+        Display disp = windowManager.getDefaultDisplay();
+        Point outP = new Point();
+        disp.getSize(outP);
+        return outP.y;
+    }
+    
+    //获取底栏高度
+    public int getNavbarHeight() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            try{
+                WindowInsets windowInsets = null;
+                windowInsets = AppManager.getInstance().currentActivity().getWindow().getDecorView().getRootView().getRootWindowInsets();
+                if (windowInsets != null) {
+                    return windowInsets.getStableInsetBottom();
+                }
+            }catch (Exception e){}
+        }
+        int resourceId = 0;
+        int rid = getResources().getIdentifier("config_showNavigationBar", "bool", "android");
+        if (rid != 0) {
+            resourceId = getResources().getIdentifier("navigation_bar_height", "dimen", "android");
+            return getResources().getDimensionPixelSize(resourceId);
+        } else {
+            return 0;
+        }
+    }
+    
+    //获取真实的屏幕高度，注意判断非0
+    public int getRootHeight() {
+        WindowManager windowManager = (WindowManager) getSystemService(Context.WINDOW_SERVICE);
+        int diaplayHeight = 0;
+        Display display = windowManager.getDefaultDisplay();
+        Point point = new Point();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+            display.getRealSize(point);
+            diaplayHeight = point.y;
+        } else {
+            DisplayMetrics dm = new DisplayMetrics();
+            windowManager.getDefaultDisplay().getMetrics(dm);
+            diaplayHeight = dm.heightPixels; //得到高度```
+        }
+        return diaplayHeight;
+    }
+    
+    public boolean copy(String s) {
+        if (isNull(s)) {
+            log("要复制的文本为空");
+            return false;
+        }
+        ClipboardManager cm = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
+        ClipData mClipData = ClipData.newPlainText("Label", s);
+        cm.setPrimaryClip(mClipData);
+        return true;
+    }
+    
+    public static boolean isNull(String s) {
+        if (s == null || s.trim().isEmpty() || "null".equals(s) || "(null)".equals(s)) {
+            return true;
+        }
+        return false;
+    }
+    
+    //打开指定App
+    public boolean openApp(String packageName) {
+        PackageManager packageManager = getPackageManager();
+        if (isInstallApp(packageName)) {
+            try {
+                Intent intent = packageManager.getLaunchIntentForPackage(packageName);
+                startActivity(intent);
+                return true;
+            } catch (Exception e) {
+                if (DEBUGMODE) {
+                    e.printStackTrace();
+                }
+                return false;
+            }
+        } else {
+            return false;
+        }
+    }
+    
+    //检测App是否已安装
+    public boolean isInstallApp(String packageName) {
+        PackageInfo packageInfo = null;
+        try {
+            packageInfo = getPackageManager().getPackageInfo(packageName, 0);
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
+        return packageInfo != null;
+    }
+}
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java b/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java
index d32567d..ed5c60d 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java
@@ -16,20 +16,28 @@
 import android.widget.EditText;
 import android.widget.Toast;
 
+import com.kongzue.baseframework.interfaces.BindView;
+import com.kongzue.baseframework.interfaces.BindViews;
 import com.kongzue.baseframework.interfaces.LifeCircleListener;
 import com.kongzue.baseframework.interfaces.Layout;
+import com.kongzue.baseframework.interfaces.OnClick;
 import com.kongzue.baseframework.util.JumpParameter;
 import com.kongzue.baseframework.util.OnPermissionResponseListener;
 import com.kongzue.baseframework.util.OnJumpResponseListener;
 import com.kongzue.baseframework.util.ParameterCache;
 import com.kongzue.baseframework.util.toast.Toaster;
 
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+
 import static com.kongzue.baseframework.BaseFrameworkSettings.DEBUGMODE;
 
 /**
- * @Version: 6.5.5
+ * @Version: 6.7.0
  * @Author: Kongzue
- * @github: https://github.com/kongzue/BaseFrameworkSettings
+ * @github: https://github.com/kongzue/BaseFramework
  * @link: http://kongzue.com/
  * @describe: 自动化代码流水线作业，以及对原生安卓、MIUI、flyme的透明状态栏显示灰色图标文字的支持，同时提供一些小工具简化开发难度，详细说明文档：https://github.com/kongzue/BaseFramework
  */
@@ -37,6 +45,8 @@
 public abstract class BaseFragment<ME extends BaseActivity> extends Fragment {
     
     public int layoutResId = -1;
+    public boolean isActive = false;                                        //当前Fragment是否处于前台
+    public int fromFragmentId = -1;
     
     /**
      * 快速管理生命周期
@@ -47,13 +57,12 @@ public abstract class BaseFragment<ME extends BaseActivity> extends Fragment {
     
     public ME me;
     
+    public BaseFragment THIS;
+    
     public void setActivity(ME activity) {
         this.me = activity;
     }
     
-    public BaseFragment() {
-    }
-    
     /**
      * 根布局，可以直接用
      */
@@ -72,6 +81,7 @@ public BaseFragment() {
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         me = (ME) getActivity();
+        THIS = this;
         this.savedInstanceState = savedInstanceState;
         try {
             Layout layout = getClass().getAnnotation(Layout.class);
@@ -89,8 +99,6 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
         }
         if (rootView == null) {
             rootView = LayoutInflater.from(getActivity()).inflate(layoutResId, container, false);
-            //防止点击穿透
-            rootView.setClickable(true);
         }
         
         if (lifeCircleListener != null) {
@@ -98,11 +106,86 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
         }
         
         initViews();
+        bindAutoEvent();
+        initBindViewAndFunctions();
         initDatas();
         setEvents();
         return rootView;
     }
     
+    protected void initBindViewAndFunctions() {
+        try {
+            Field[] fields = getClass().getDeclaredFields();
+            for (Field field : fields) {
+                if (field.isAnnotationPresent(BindView.class)) {
+                    BindView bindView = field.getAnnotation(BindView.class);
+                    if (bindView != null && bindView.value() != 0) {
+                        field.setAccessible(true);
+                        field.set(THIS, THIS.findViewById(bindView.value()));
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        try {
+            Field[] fields = getClass().getDeclaredFields();
+            for (Field field : fields) {
+                if (field.isAnnotationPresent(BindViews.class)) {
+                    BindViews bindView = field.getAnnotation(BindViews.class);
+                    if (bindView != null && bindView.value().length != 0) {
+                        List<View> viewList = new ArrayList<>();
+                        for (int id : bindView.value()) {
+                            viewList.add(findViewById(id));
+                        }
+                        field.setAccessible(true);
+                        field.set(THIS, viewList);
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        try {
+            Method[] methods = getClass().getDeclaredMethods();
+            for (Method method : methods) {
+                if (method.isAnnotationPresent(OnClick.class)) {
+                    OnClick onClick = method.getAnnotation(OnClick.class);
+                    if (onClick != null && onClick.value() != 0) {
+                        View v = findViewById(onClick.value());
+                        v.setOnClickListener(new View.OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+                                try {
+                                    method.invoke(THIS, v);
+                                } catch (Exception e) {
+                                    try {
+                                        method.invoke(THIS);
+                                    } catch (Exception e1) {
+                                    }
+                                }
+                            }
+                        });
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+    
+    private void bindAutoEvent() {
+        View backView = findViewById(R.id.back);
+        if (backView != null) {
+            backView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    me.onBackPressed();
+                }
+            });
+        }
+    }
+    
     public void setLifeCircleListener(LifeCircleListener lifeCircleListener) {
         this.lifeCircleListener = lifeCircleListener;
     }
@@ -257,24 +340,35 @@ public boolean jump(Class<?> cls, JumpParameter jumpParameter, OnJumpResponseLis
     
     /**
      * 跳转到绑定在同一 BaseActivity 下指定角标的 BaseFragment
+     *
      * @param index 角标
      */
     public void jump(int index) {
         me.changeFragment(index);
     }
     
+    public void jump(int index, int enterAnimResId, int exitAnimResId) {
+        me.changeFragment(index, enterAnimResId, exitAnimResId);
+    }
+    
     /**
      * 跳转到绑定在同一 BaseActivity 下指定已实例化的 BaseFragment 对象
+     *
      * @param baseFragment 指定的 BaseFragment 对象
      */
     public void jump(BaseFragment baseFragment) {
         me.changeFragment(baseFragment);
     }
     
+    public void jump(BaseFragment baseFragment, int enterAnimResId, int exitAnimResId) {
+        me.changeFragment(baseFragment, enterAnimResId, exitAnimResId);
+    }
+    
     /**
      * 转到绑定在同一 BaseActivity 下指定已实例化的 BaseFragment 对象，并携带要传递参数
+     *
      * @param baseFragment 指定的 BaseFragment 对象
-     * @param parameter 要传递参数
+     * @param parameter    要传递参数
      */
     public void jump(BaseFragment baseFragment, JumpParameter parameter) {
         if (parameter != null) {
@@ -285,7 +379,8 @@ public void jump(BaseFragment baseFragment, JumpParameter parameter) {
     
     /**
      * 跳转到绑定在同一 BaseActivity 下指定角标的 BaseFragment，并携带要传递参数
-     * @param index 角标
+     *
+     * @param index         角标
      * @param jumpParameter 要传递参数
      */
     public void jump(int index, JumpParameter jumpParameter) {
@@ -299,8 +394,9 @@ public void jump(int index, JumpParameter jumpParameter) {
     
     /**
      * 转到绑定在同一 BaseActivity 下指定已实例化的 BaseFragment 对象，并携带要传递参数和回调
-     * @param baseFragment 指定的 BaseFragment 对象
-     * @param jumpParameter 要传递参数
+     *
+     * @param baseFragment           指定的 BaseFragment 对象
+     * @param jumpParameter          要传递参数
      * @param onJumpResponseListener 回调
      */
     public void jump(BaseFragment baseFragment, JumpParameter jumpParameter, OnJumpResponseListener onJumpResponseListener) {
@@ -317,8 +413,9 @@ public void jump(BaseFragment baseFragment, JumpParameter jumpParameter, OnJumpR
     
     /**
      * 跳转到绑定在同一 BaseActivity 下指定角标的 BaseFragment，并携带要传递参数和回调
-     * @param index 角标
-     * @param jumpParameter 要传递参数
+     *
+     * @param index                  角标
+     * @param jumpParameter          要传递参数
      * @param onJumpResponseListener 回调
      */
     public void jump(int index, JumpParameter jumpParameter, OnJumpResponseListener onJumpResponseListener) {
@@ -440,8 +537,9 @@ public void onResume() {
             }
         }
         if (isLoaded) {
-            onShow(isCallShow);
-            
+            if (isActive) {
+                onShow(isCallShow);
+            }
             if (isCallShow) {
                 JumpParameter jumpParameter = ParameterCache.getInstance().get(this.getClass().getName());
                 if (jumpParameter != null) {
@@ -482,7 +580,8 @@ public void onDestroy() {
     /**
      * 重写此方法以判断当 Fragment 被切换时触发，请注意此时界面可能被暂停
      */
-    public void onHide(){
+    public void onHide() {
+        isActive = false;
         ParameterCache.getInstance().cleanParameter(this.getClass().getName());
     }
     
@@ -568,6 +667,7 @@ public int getColorS(@ColorRes int id) {
      */
     public void callShow() {
         isCallShow = true;
+        isActive = true;
         if (rootView != null) {
             onResume();
         }
@@ -588,5 +688,5 @@ public void setAdded(boolean isAdded) {
     public boolean isAddedCompat() {
         return mAdded;
     }
-}
-
+    
+}
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/interfaces/BindView.java b/baseframework/src/main/java/com/kongzue/baseframework/interfaces/BindView.java
new file mode 100644
index 0000000..d50bb87
--- /dev/null
+++ b/baseframework/src/main/java/com/kongzue/baseframework/interfaces/BindView.java
@@ -0,0 +1,19 @@
+package com.kongzue.baseframework.interfaces;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author: Kongzue
+ * @github: https://github.com/kongzue/
+ * @homepage: http://kongzue.com/
+ * @mail: myzcxhh@live.cn
+ * @createTime: 2019/11/21 15:17
+ */
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface BindView {
+    int value() default 0;
+}
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/interfaces/BindViews.java b/baseframework/src/main/java/com/kongzue/baseframework/interfaces/BindViews.java
new file mode 100644
index 0000000..2833674
--- /dev/null
+++ b/baseframework/src/main/java/com/kongzue/baseframework/interfaces/BindViews.java
@@ -0,0 +1,19 @@
+package com.kongzue.baseframework.interfaces;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author: Kongzue
+ * @github: https://github.com/kongzue/
+ * @homepage: http://kongzue.com/
+ * @mail: myzcxhh@live.cn
+ * @createTime: 2019/11/21 22:08
+ */
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface BindViews {
+    int[] value() default 0;
+}
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/interfaces/NavigationBarBackgroundColor.java b/baseframework/src/main/java/com/kongzue/baseframework/interfaces/NavigationBarBackgroundColor.java
index 38d6f20..52e4eff 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/interfaces/NavigationBarBackgroundColor.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/interfaces/NavigationBarBackgroundColor.java
@@ -16,4 +16,4 @@
     int r() default 0;
     int g() default 0;
     int b() default 0;
-}
+}
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/interfaces/NavigationBarBackgroundColorHex.java b/baseframework/src/main/java/com/kongzue/baseframework/interfaces/NavigationBarBackgroundColorHex.java
new file mode 100644
index 0000000..de60de5
--- /dev/null
+++ b/baseframework/src/main/java/com/kongzue/baseframework/interfaces/NavigationBarBackgroundColorHex.java
@@ -0,0 +1,21 @@
+package com.kongzue.baseframework.interfaces;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author: Kongzue
+ * @github: https://github.com/kongzue/
+ * @homepage: http://kongzue.com/
+ * @mail: myzcxhh@live.cn
+ * @createTime: 2019/9/27 15:30
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface NavigationBarBackgroundColorHex {
+    String value() default "";
+}
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/interfaces/NavigationBarBackgroundColorInt.java b/baseframework/src/main/java/com/kongzue/baseframework/interfaces/NavigationBarBackgroundColorInt.java
new file mode 100644
index 0000000..1d99dac
--- /dev/null
+++ b/baseframework/src/main/java/com/kongzue/baseframework/interfaces/NavigationBarBackgroundColorInt.java
@@ -0,0 +1,23 @@
+package com.kongzue.baseframework.interfaces;
+
+import android.graphics.Color;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author: Kongzue
+ * @github: https://github.com/kongzue/
+ * @homepage: http://kongzue.com/
+ * @mail: myzcxhh@live.cn
+ * @createTime: 2019/9/23 13:44
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface NavigationBarBackgroundColorInt {
+    int value() default -16777216;
+}
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/interfaces/NavigationBarBackgroundColorRes.java b/baseframework/src/main/java/com/kongzue/baseframework/interfaces/NavigationBarBackgroundColorRes.java
new file mode 100644
index 0000000..7642c38
--- /dev/null
+++ b/baseframework/src/main/java/com/kongzue/baseframework/interfaces/NavigationBarBackgroundColorRes.java
@@ -0,0 +1,23 @@
+package com.kongzue.baseframework.interfaces;
+
+import com.kongzue.baseframework.R;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author: Kongzue
+ * @github: https://github.com/kongzue/
+ * @homepage: http://kongzue.com/
+ * @mail: myzcxhh@live.cn
+ * @createTime: 2019/9/23 13:45
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface NavigationBarBackgroundColorRes {
+    int value() default -1;
+}
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/interfaces/OnClick.java b/baseframework/src/main/java/com/kongzue/baseframework/interfaces/OnClick.java
new file mode 100644
index 0000000..8572ca1
--- /dev/null
+++ b/baseframework/src/main/java/com/kongzue/baseframework/interfaces/OnClick.java
@@ -0,0 +1,19 @@
+package com.kongzue.baseframework.interfaces;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author: Kongzue
+ * @github: https://github.com/kongzue/
+ * @homepage: http://kongzue.com/
+ * @mail: myzcxhh@live.cn
+ * @createTime: 2019/11/21 15:19
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface OnClick {
+    int value() default 0;
+}
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/interfaces/OnSDKInitializedCallBack.java b/baseframework/src/main/java/com/kongzue/baseframework/interfaces/OnSDKInitializedCallBack.java
new file mode 100644
index 0000000..4580f65
--- /dev/null
+++ b/baseframework/src/main/java/com/kongzue/baseframework/interfaces/OnSDKInitializedCallBack.java
@@ -0,0 +1,14 @@
+package com.kongzue.baseframework.interfaces;
+
+/**
+ * @author: Kongzue
+ * @github: https://github.com/kongzue/
+ * @homepage: http://kongzue.com/
+ * @mail: myzcxhh@live.cn
+ * @createTime: 2019/9/23 12:50
+ */
+public interface OnSDKInitializedCallBack {
+    
+    void onInitialized();
+    
+}
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/AppManager.java b/baseframework/src/main/java/com/kongzue/baseframework/util/AppManager.java
index 7ff70e5..2ffc001 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/util/AppManager.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/util/AppManager.java
@@ -14,6 +14,7 @@
 import java.util.Stack;
 
 /**
+ * @author xiaohaibin
  * @link https://xiaohaibin.github.io/
  * @email： xhb_199409@163.com
  * @github: https://github.com/xiaohaibin
@@ -133,14 +134,18 @@ public void AppExit(Context context) {
     }
     
     public void deleteActivity(BaseActivity activity) {
-        if (activity != null) {
-            activityStack.remove(activity);
-            if (onActivityStatusChangeListener != null) {
-                onActivityStatusChangeListener.onActivityDestroy(activity);
-                if (activityStack.isEmpty()) {
-                    onActivityStatusChangeListener.onAllActivityClose();
+        try{
+            if (activity != null) {
+                activityStack.remove(activity);
+                if (onActivityStatusChangeListener != null) {
+                    onActivityStatusChangeListener.onActivityDestroy(activity);
+                    if (activityStack.isEmpty()) {
+                        onActivityStatusChangeListener.onAllActivityClose();
+                    }
                 }
             }
+        }catch (Exception e){
+        
         }
     }
     
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/FragmentChangeUtil.java b/baseframework/src/main/java/com/kongzue/baseframework/util/FragmentChangeUtil.java
index 5fe750a..ab70369 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/util/FragmentChangeUtil.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/util/FragmentChangeUtil.java
@@ -29,6 +29,8 @@ public class FragmentChangeUtil {
     private BaseActivity me;
     private List<BaseFragment> fragmentList;
     private BaseFragment focusFragment;
+    private int enterAnimResId;
+    private int exitAnimResId;
     
     private int frameLayoutResId;
     
@@ -74,6 +76,12 @@ public FragmentChangeUtil show(BaseFragment fragment) {
             return null;
         }
         FragmentTransaction transaction = me.getSupportFragmentManager().beginTransaction();
+        if (enterAnimResId != 0 && exitAnimResId != 0) {
+            transaction.setCustomAnimations(enterAnimResId, exitAnimResId);
+            enterAnimResId = 0;
+            exitAnimResId = 0;
+        }
+        
         if (focusFragment != null) {
             focusFragment.onHide();
             transaction.hide(focusFragment);
@@ -100,6 +108,12 @@ public FragmentChangeUtil show(int index) {
             return null;
         }
         FragmentTransaction transaction = me.getSupportFragmentManager().beginTransaction();
+        if (enterAnimResId != 0 && exitAnimResId != 0) {
+            transaction.setCustomAnimations(enterAnimResId, exitAnimResId);
+            enterAnimResId = 0;
+            exitAnimResId = 0;
+        }
+        
         if (focusFragment != null) {
             focusFragment.onHide();
             transaction.hide(focusFragment);
@@ -126,6 +140,11 @@ public FragmentChangeUtil hide(int index) {
             return null;
         }
         FragmentTransaction transaction = me.getSupportFragmentManager().beginTransaction();
+        if (enterAnimResId != 0 && exitAnimResId != 0) {
+            transaction.setCustomAnimations(enterAnimResId, exitAnimResId);
+            enterAnimResId = 0;
+            exitAnimResId = 0;
+        }
         
         if (!fragmentList.get(index).isAddedCompat()) {
             transaction.add(frameLayoutResId, fragmentList.get(index));
@@ -143,6 +162,12 @@ public FragmentChangeUtil hideNow() {
             return null;
         }
         FragmentTransaction transaction = me.getSupportFragmentManager().beginTransaction();
+        if (enterAnimResId != 0 && exitAnimResId != 0) {
+            transaction.setCustomAnimations(enterAnimResId, exitAnimResId);
+            enterAnimResId = 0;
+            exitAnimResId = 0;
+        }
+        
         focusFragment.onHide();
         transaction.hide(focusFragment);
         
@@ -156,7 +181,11 @@ public FragmentChangeUtil hide(BaseFragment fragment) {
             return null;
         }
         FragmentTransaction transaction = me.getSupportFragmentManager().beginTransaction();
-        
+        if (enterAnimResId != 0 && exitAnimResId != 0) {
+            transaction.setCustomAnimations(enterAnimResId, exitAnimResId);
+            enterAnimResId = 0;
+            exitAnimResId = 0;
+        }
         
         if (!fragment.isAddedCompat()) {
             transaction.add(frameLayoutResId, fragment);
@@ -174,6 +203,11 @@ public FragmentChangeUtil remove(BaseFragment fragment) {
             return null;
         }
         FragmentTransaction transaction = me.getSupportFragmentManager().beginTransaction();
+        if (enterAnimResId != 0 && exitAnimResId != 0) {
+            transaction.setCustomAnimations(enterAnimResId, exitAnimResId);
+            enterAnimResId = 0;
+            exitAnimResId = 0;
+        }
         
         if (fragment.isAddedCompat()) {
             transaction.remove(fragment);
@@ -232,6 +266,19 @@ public BaseFragment getFragment(int index) {
         return fragmentList.get(index);
     }
     
+    public BaseFragment getFragment(Class c) {
+        if (me == null || frameLayoutResId == 0 || fragmentList == null) {
+            log("错误：请先执行build(...)方法初始化FragmentChangeUtil");
+            return null;
+        }
+        for (BaseFragment b : fragmentList) {
+            if (b.getClass().equals(c)) {
+                return b;
+            }
+        }
+        return null;
+    }
+    
     public OnFragmentChangeListener getOnFragmentChangeListener() {
         return onFragmentChangeListener;
     }
@@ -240,4 +287,18 @@ public FragmentChangeUtil setOnFragmentChangeListener(OnFragmentChangeListener o
         this.onFragmentChangeListener = onFragmentChangeListener;
         return this;
     }
+    
+    public int size() {
+        if (fragmentList == null) {
+            log("错误：请先执行build(...)方法初始化FragmentChangeUtil");
+            return 0;
+        }
+        return fragmentList.size();
+    }
+    
+    public FragmentChangeUtil anim(int enterAnimResId, int exitAnimResId) {
+        this.enterAnimResId = enterAnimResId;
+        this.exitAnimResId = exitAnimResId;
+        return this;
+    }
 }
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/JsonFormat.java b/baseframework/src/main/java/com/kongzue/baseframework/util/JsonFormat.java
index d2c47dd..9f86161 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/util/JsonFormat.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/util/JsonFormat.java
@@ -45,4 +45,4 @@ public static boolean formatJson(String msg) {
         return true;
     }
     
-}
+}
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/JumpParameter.java b/baseframework/src/main/java/com/kongzue/baseframework/util/JumpParameter.java
index 26ac63a..0215c03 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/util/JumpParameter.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/util/JumpParameter.java
@@ -3,6 +3,14 @@
 import java.util.HashMap;
 import java.util.Map;
 
+/**
+ * @Version: 6.7.0
+ * @Author: Kongzue
+ * @github: https://github.com/kongzue/BaseFramework
+ * @link: http://kongzue.com/
+ * @describe: 自动化代码流水线作业，以及对原生安卓、MIUI、flyme的透明状态栏显示灰色图标文字的支持，同时提供一些小工具简化开发难度，详细说明文档：https://github.com/kongzue/BaseFramework
+ */
+
 public class JumpParameter {
     
     private Map<String, Object> datas;
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/Preferences.java b/baseframework/src/main/java/com/kongzue/baseframework/util/Preferences.java
index 2c48530..1febe65 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/util/Preferences.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/util/Preferences.java
@@ -4,6 +4,7 @@
 import android.content.SharedPreferences;
 
 /**
+ * 本类采用单例设计模式，请使用getInstance()获取本类对象后进行使用
  * Created by Kongzue on 2017/3/28.
  * Version 2.0
  * Update 2018.5.27
@@ -12,6 +13,7 @@
 public class Preferences {
     
     private static Preferences preferences;
+    private SharedPreferences sp;
     
     private Preferences() {
     }
@@ -30,96 +32,96 @@ public static Preferences getInstance() {
     /**
      * 读取属性为String类型
      *
-     * @param context 上下文索引
-     * @param path 路径
+     * @param context         上下文索引
+     * @param path            路径
      * @param preferencesName 属性名
      * @return String
      */
-    public String getString(Context context, String path, String preferencesName){
-        return getString(context,path,preferencesName,"");
+    public String getString(Context context, String path, String preferencesName) {
+        return getString(context, path, preferencesName, "");
     }
     
     /**
      * 读取属性为Boolean类型
      *
-     * @param context 上下文索引
-     * @param path 路径
+     * @param context         上下文索引
+     * @param path            路径
      * @param preferencesName 属性名
      * @return Boolean
      */
-    public boolean getBoolean(Context context, String path, String preferencesName){
-        return getBoolean(context,path,preferencesName,false);
+    public boolean getBoolean(Context context, String path, String preferencesName) {
+        return getBoolean(context, path, preferencesName, false);
     }
     
     /**
      * 读取属性为Int类型
      *
-     * @param context 上下文索引
-     * @param path 路径
+     * @param context         上下文索引
+     * @param path            路径
      * @param preferencesName 属性名
      * @return Int
      */
-    public int getInt(Context context, String path, String preferencesName){
-        return getInt(context,path,preferencesName,0);
+    public int getInt(Context context, String path, String preferencesName) {
+        return getInt(context, path, preferencesName, 0);
     }
     
     /**
      * 读取属性为String类型
      *
-     * @param context 上下文索引
-     * @param path 路径
+     * @param context         上下文索引
+     * @param path            路径
      * @param preferencesName 属性名
-     * @param defaultValue 默认值
+     * @param defaultValue    默认值
      * @return String
      */
-    public String getString(Context context, String path, String preferencesName,String defaultValue){
-        SharedPreferences preferences = context.getSharedPreferences(path, Context.MODE_PRIVATE);
-        String value = preferences.getString(preferencesName, defaultValue);
+    public String getString(Context context, String path, String preferencesName, String defaultValue) {
+        initSharedPreferences(context, path);
+        String value = sp.getString(preferencesName, defaultValue);
         return value;
     }
     
     /**
      * 读取属性为Boolean类型
      *
-     * @param context 上下文索引
-     * @param path 路径
+     * @param context         上下文索引
+     * @param path            路径
      * @param preferencesName 属性名
-     * @param defaultValue 默认值
+     * @param defaultValue    默认值
      * @return Boolean
      */
-    public boolean getBoolean(Context context, String path, String preferencesName,boolean defaultValue){
-        SharedPreferences preferences = context.getSharedPreferences(path, Context.MODE_PRIVATE);
-        boolean value = preferences.getBoolean(preferencesName, defaultValue);
+    public boolean getBoolean(Context context, String path, String preferencesName, boolean defaultValue) {
+        initSharedPreferences(context, path);
+        boolean value = sp.getBoolean(preferencesName, defaultValue);
         return value;
     }
     
     /**
      * 读取属性为Int类型
      *
-     * @param context 上下文索引
-     * @param path 路径
+     * @param context         上下文索引
+     * @param path            路径
      * @param preferencesName 属性名
-     * @param defaultValue 默认值
+     * @param defaultValue    默认值
      * @return Int
      */
-    public int getInt(Context context, String path, String preferencesName,int defaultValue){
-        SharedPreferences preferences = context.getSharedPreferences(path, Context.MODE_PRIVATE);
-        int value = preferences.getInt(preferencesName, defaultValue);
+    public int getInt(Context context, String path, String preferencesName, int defaultValue) {
+        initSharedPreferences(context, path);
+        int value = sp.getInt(preferencesName, defaultValue);
         return value;
     }
     
     /**
      * 写入String属性方法，占用资源较少，但不会立即生效
      *
-     * @param context 上下文索引
-     * @param path 路径
+     * @param context         上下文索引
+     * @param path            路径
      * @param preferencesName 属性名
-     * @param value 值
+     * @param value           值
      * @return none
      */
-    public void set(Context context, String path, String preferencesName,String value){
-        SharedPreferences preferences = context.getSharedPreferences(path, Context.MODE_PRIVATE);
-        SharedPreferences.Editor editor = preferences.edit();
+    public void set(Context context, String path, String preferencesName, String value) {
+        initSharedPreferences(context, path);
+        SharedPreferences.Editor editor = sp.edit();
         editor.putString(preferencesName, value);
         editor.apply();
     }
@@ -127,15 +129,15 @@ public void set(Context context, String path, String preferencesName,String valu
     /**
      * 写入Boolean属性方法，占用资源较少，但不会立即生效
      *
-     * @param context 上下文索引
-     * @param path 路径
+     * @param context         上下文索引
+     * @param path            路径
      * @param preferencesName 属性名
-     * @param value 值
+     * @param value           值
      * @return none
      */
-    public void set(Context context, String path, String preferencesName,boolean value){
-        SharedPreferences preferences = context.getSharedPreferences(path, Context.MODE_PRIVATE);
-        SharedPreferences.Editor editor = preferences.edit();
+    public void set(Context context, String path, String preferencesName, boolean value) {
+        initSharedPreferences(context, path);
+        SharedPreferences.Editor editor = sp.edit();
         editor.putBoolean(preferencesName, value);
         editor.apply();
     }
@@ -143,15 +145,15 @@ public void set(Context context, String path, String preferencesName,boolean val
     /**
      * 写入Int属性方法，占用资源较少，但不会立即生效
      *
-     * @param context 上下文索引
-     * @param path 路径
+     * @param context         上下文索引
+     * @param path            路径
      * @param preferencesName 属性名
-     * @param value 值
+     * @param value           值
      * @return none
      */
-    public void set(Context context, String path, String preferencesName,int value){
-        SharedPreferences preferences = context.getSharedPreferences(path, Context.MODE_PRIVATE);
-        SharedPreferences.Editor editor = preferences.edit();
+    public void set(Context context, String path, String preferencesName, int value) {
+        initSharedPreferences(context, path);
+        SharedPreferences.Editor editor = sp.edit();
         editor.putInt(preferencesName, value);
         editor.apply();
     }
@@ -159,15 +161,15 @@ public void set(Context context, String path, String preferencesName,int value){
     /**
      * 写入String属性方法，立即生效
      *
-     * @param context 上下文索引
-     * @param path 路径
+     * @param context         上下文索引
+     * @param path            路径
      * @param preferencesName 属性名
-     * @param value 值
+     * @param value           值
      * @return none
      */
-    public void commit(Context context, String path, String preferencesName,String value){
-        SharedPreferences preferences = context.getSharedPreferences(path, Context.MODE_PRIVATE);
-        SharedPreferences.Editor editor = preferences.edit();
+    public void commit(Context context, String path, String preferencesName, String value) {
+        initSharedPreferences(context, path);
+        SharedPreferences.Editor editor = sp.edit();
         editor.putString(preferencesName, value);
         editor.commit();
     }
@@ -175,15 +177,15 @@ public void commit(Context context, String path, String preferencesName,String v
     /**
      * 写入Boolean属性方法，立即生效
      *
-     * @param context 上下文索引
-     * @param path 路径
+     * @param context         上下文索引
+     * @param path            路径
      * @param preferencesName 属性名
-     * @param value 值
+     * @param value           值
      * @return none
      */
-    public void commit(Context context, String path, String preferencesName,boolean value){
-        SharedPreferences preferences = context.getSharedPreferences(path, Context.MODE_PRIVATE);
-        SharedPreferences.Editor editor = preferences.edit();
+    public void commit(Context context, String path, String preferencesName, boolean value) {
+        initSharedPreferences(context, path);
+        SharedPreferences.Editor editor = sp.edit();
         editor.putBoolean(preferencesName, value);
         editor.commit();
     }
@@ -191,15 +193,15 @@ public void commit(Context context, String path, String preferencesName,boolean
     /**
      * 写入Int属性方法，立即生效
      *
-     * @param context 上下文索引
-     * @param path 路径
+     * @param context         上下文索引
+     * @param path            路径
      * @param preferencesName 属性名
-     * @param value 值
+     * @param value           值
      * @return none
      */
-    public void commit(Context context, String path, String preferencesName,int value){
-        SharedPreferences preferences = context.getSharedPreferences(path, Context.MODE_PRIVATE);
-        SharedPreferences.Editor editor = preferences.edit();
+    public void commit(Context context, String path, String preferencesName, int value) {
+        initSharedPreferences(context, path);
+        SharedPreferences.Editor editor = sp.edit();
         editor.putInt(preferencesName, value);
         editor.commit();
     }
@@ -208,14 +210,23 @@ public void commit(Context context, String path, String preferencesName,int valu
      * 清除（清空）所有属性的方法
      *
      * @param context 上下文索引
-     * @param path 路径
+     * @param path    路径
      * @return none
      */
-    public void cleanAll(Context context, String path){
-        SharedPreferences sp=context.getSharedPreferences(path,Context.MODE_PRIVATE);
-        if(sp!=null) {
+    public void cleanAll(Context context, String path) {
+        initSharedPreferences(context, path);
+        if (sp != null) {
             sp.edit().clear().apply();
         }
     }
     
+    private void initSharedPreferences(Context context, String path) {
+        if (sp == null) {
+            sp = context.getApplicationContext().getSharedPreferences(path, Context.MODE_PRIVATE);
+        }
+    }
+    
+    public void initSharedPreferences(SharedPreferences sp) {
+        this.sp = sp;
+    }
 }
\ No newline at end of file
diff --git a/baseframework/src/main/res/layout/layout_baseframework_holder.xml b/baseframework/src/main/res/layout/layout_baseframework_holder.xml
new file mode 100644
index 0000000..2f5e10b
--- /dev/null
+++ b/baseframework/src/main/res/layout/layout_baseframework_holder.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent" android:layout_height="match_parent">
+
+    <View
+        android:id="@+id/back"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+</RelativeLayout>
\ No newline at end of file

From bdb3ac79f691c67707f9988b8d12d171d01c9d0d Mon Sep 17 00:00:00 2001
From: kongzue <myzcxhh@live.cn>
Date: Wed, 27 Nov 2019 18:18:16 +0800
Subject: [PATCH 05/18] 6.7.3 pub

---
 .idea/caches/build_file_checksums.ser | Bin 592 -> 592 bytes
 .idea/gradle.xml                      |   3 +++
 baseframework/build.gradle            |  12 ++++++------
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 85615cb4d9bb36d4850d12efcaebccc058db146d..82531c19c89dd7601582ecfbd517d2be6c34152b 100644
GIT binary patch
delta 35
tcmV+;0Nnr31kePKnFC$=Qn8$M0T4pe1)yEz*yyH%Q;4}VS(uX{0xu*K57Ynv

delta 35
rcmcb>a)D*SOy;ou=^N*iG75ZhE=i6%8@wZw>(X;&tNN9b6`Aw_7Re6i

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d03de62..1fffa31 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,6 +3,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <compositeConfiguration>
+          <compositeBuild compositeDefinitionSource="SCRIPT" />
+        </compositeConfiguration>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
diff --git a/baseframework/build.gradle b/baseframework/build.gradle
index ed5cfb5..28f0b10 100644
--- a/baseframework/build.gradle
+++ b/baseframework/build.gradle
@@ -6,16 +6,16 @@ def siteUrl = 'https://github.com/kongzue/BaseFramework' //项目在github主页
 def gitUrl = 'https://github.com/kongzue/BaseFramework.git'   //Git仓库的地址
 
 group = "com.kongzue.baseframeworkx"//发布aar前缀根节点
-version = "6.7.1"//发布aar的库版本
+version = "6.7.3"//发布aar的库版本
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 28
-        versionCode 105
-        versionName "6.7.1"
+        targetSdkVersion 29
+        versionCode 107
+        versionName "6.7.3"
     }
 
     buildTypes {
@@ -90,6 +90,6 @@ bintray {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0+'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 }

From 706905f1305519d87efa981f625b6dcd473ee1d1 Mon Sep 17 00:00:00 2001
From: kongzue <myzcxhh@live.cn>
Date: Wed, 27 Nov 2019 18:19:47 +0800
Subject: [PATCH 06/18] 6.7.3 pub

---
 .idea/caches/gradle_models.ser               | Bin 0 -> 165556 bytes
 .idea/codeStyles/Project.xml                 | 116 +++++++++++++++++++
 .idea/inspectionProfiles/Project_Default.xml |  96 +++++++++++++++
 .idea/markdown-navigator.xml                 |  86 ++++++++++++++
 .idea/vcs.xml                                |   6 +
 5 files changed, 304 insertions(+)
 create mode 100644 .idea/caches/gradle_models.ser
 create mode 100644 .idea/codeStyles/Project.xml
 create mode 100644 .idea/inspectionProfiles/Project_Default.xml
 create mode 100644 .idea/markdown-navigator.xml
 create mode 100644 .idea/vcs.xml

diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
new file mode 100644
index 0000000000000000000000000000000000000000..fe080f7262fa5511af290ba0c6439f264e49925f
GIT binary patch
literal 165556
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

literal 0
HcmV?d00001

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..681f41a
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,116 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <codeStyleSettings language="XML">
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..9a0470e
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,96 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="AliAccessStaticViaInstance" enabled="false" level="BLOCKER" enabled_by_default="false" />
+    <inspection_tool class="AliArrayNamingShouldHaveBracket" enabled="false" level="MAJOR" enabled_by_default="false" />
+    <inspection_tool class="AliControlFlowStatementWithoutBraces" enabled="false" level="BLOCKER" enabled_by_default="false" />
+    <inspection_tool class="AliDeprecation" enabled="false" level="CRITICAL" enabled_by_default="false" />
+    <inspection_tool class="AliEqualsAvoidNull" enabled="false" level="CRITICAL" enabled_by_default="false" />
+    <inspection_tool class="AliLongLiteralsEndingWithLowercaseL" enabled="false" level="BLOCKER" enabled_by_default="false" />
+    <inspection_tool class="AliMissingOverrideAnnotation" enabled="false" level="BLOCKER" enabled_by_default="false" />
+    <inspection_tool class="AliWrapperTypeEquality" enabled="false" level="BLOCKER" enabled_by_default="false" />
+    <inspection_tool class="AlibabaAbstractClassShouldStartWithAbstractNaming" enabled="false" level="CRITICAL" enabled_by_default="false" />
+    <inspection_tool class="AlibabaAbstractMethodOrInterfaceMethodMustUseJavadoc" enabled="false" level="MAJOR" enabled_by_default="false" />
+    <inspection_tool class="AlibabaAvoidApacheBeanUtilsCopy" enabled="false" level="BLOCKER" enabled_by_default="false" />
+    <inspection_tool class="AlibabaAvoidCallStaticSimpleDateFormat" enabled="false" level="CRITICAL" enabled_by_default="false" />
+    <inspection_tool class="AlibabaAvoidCommentBehindStatement" enabled="false" level="MAJOR" enabled_by_default="false" />
+    <inspection_tool class="AlibabaAvoidComplexCondition" enabled="false" level="MAJOR" enabled_by_default="false" />
+    <inspection_tool class="AlibabaAvoidConcurrentCompetitionRandom" enabled="false" level="MAJOR" enabled_by_default="false" />
+    <inspection_tool class="AlibabaAvoidDoubleOrFloatEqualCompare" enabled="false" level="CRITICAL" enabled_by_default="false" />
+    <inspection_tool class="AlibabaAvoidManuallyCreateThread" enabled="false" level="CRITICAL" enabled_by_default="false" />
+    <inspection_tool class="AlibabaAvoidMissUseOfMathRandom" enabled="false" level="MAJOR" enabled_by_default="false" />
+    <inspection_tool class="AlibabaAvoidNegationOperator" enabled="false" level="MAJOR" enabled_by_default="false" />
+    <inspection_tool class="AlibabaAvoidNewDateGetTime" enabled="false" level="BLOCKER" enabled_by_default="false" />
+    <inspection_tool class="AlibabaAvoidPatternCompileInMethod" enabled="false" level="BLOCKER" enabled_by_default="false" />
+    <inspection_tool class="AlibabaAvoidReturnInFinally" enabled="false" level="CRITICAL" enabled_by_default="false" />
+    <inspection_tool class="AlibabaAvoidStartWithDollarAndUnderLineNaming" enabled="false" level="CRITICAL" enabled_by_default="false" />
+    <inspection_tool class="AlibabaAvoidUseTimer" enabled="false" level="BLOCKER" enabled_by_default="false" />
+    <inspection_tool class="AlibabaBigDecimalAvoidDoubleConstructor" enabled="false" level="MAJOR" enabled_by_default="false" />
+    <inspection_tool class="AlibabaBooleanPropertyShouldNotStartWithIs" enabled="false" level="CRITICAL" enabled_by_default="false" />
+    <inspection_tool class="AlibabaClassCastExceptionWithSubListToArrayList" enabled="false" level="CRITICAL" enabled_by_default="false" />
+    <inspection_tool class="AlibabaClassCastExceptionWithToArray" enabled="false" level="CRITICAL" enabled_by_default="false" />
+    <inspection_tool class="AlibabaClassMustHaveAuthor" enabled="false" level="MAJOR" enabled_by_default="false" />
+    <inspection_tool class="AlibabaClassNamingShouldBeCamel" enabled="false" level="MAJOR" enabled_by_default="false" />
+    <inspection_tool class="AlibabaCollectionInitShouldAssignCapacity" enabled="false" level="MAJOR" enabled_by_default="false" />
+    <inspection_tool class="AlibabaCommentsMustBeJavadocFormat" enabled="false" level="MAJOR" enabled_by_default="false" />
+    <inspection_tool class="AlibabaConcurrentExceptionWithModifyOriginSubList" enabled="false" level="CRITICAL" enabled_by_default="false" />
+    <inspection_tool class="AlibabaConstantFieldShouldBeUpperCase" enabled="false" level="CRITICAL" enabled_by_default="false" />
+    <inspection_tool class="AlibabaCountDownShouldInFinally" enabled="false" level="MAJOR" enabled_by_default="false" />
+    <inspection_tool class="AlibabaDontModifyInForeachCircle" enabled="false" level="BLOCKER" enabled_by_default="false" />
+    <inspection_tool class="AlibabaEnumConstantsMustHaveComment" enabled="false" level="CRITICAL" enabled_by_default="false" />
+    <inspection_tool class="AlibabaExceptionClassShouldEndWithException" enabled="false" level="CRITICAL" enabled_by_default="false" />
+    <inspection_tool class="AlibabaIbatisMethodQueryForList" enabled="false" level="MAJOR" enabled_by_default="false" />
+    <inspection_tool class="AlibabaLowerCamelCaseVariableNaming" enabled="false" level="CRITICAL" enabled_by_default="false" />
+    <inspection_tool class="AlibabaMethodReturnWrapperType" enabled="false" level="MAJOR" enabled_by_default="false" />
+    <inspection_tool class="AlibabaMethodTooLong" enabled="false" level="MAJOR" enabled_by_default="false" />
+    <inspection_tool class="AlibabaPackageNaming" enabled="false" level="MAJOR" enabled_by_default="false" />
+    <inspection_tool class="AlibabaPojoMustOverrideToString" enabled="false" level="MAJOR" enabled_by_default="false" />
+    <inspection_tool class="AlibabaPojoMustUsePrimitiveField" enabled="false" level="MAJOR" enabled_by_default="false" />
+    <inspection_tool class="AlibabaPojoNoDefaultValue" enabled="false" level="MAJOR" enabled_by_default="false" />
+    <inspection_tool class="AlibabaRemoveCommentedCode" enabled="false" level="MAJOR" enabled_by_default="false" />
+    <inspection_tool class="AlibabaServiceOrDaoClassShouldEndWithImpl" enabled="false" level="CRITICAL" enabled_by_default="false" />
+    <inspection_tool class="AlibabaStringConcat" enabled="false" level="MAJOR" enabled_by_default="false" />
+    <inspection_tool class="AlibabaSwitchStatement" enabled="false" level="CRITICAL" enabled_by_default="false" />
+    <inspection_tool class="AlibabaTestClassShouldEndWithTestNaming" enabled="false" level="MAJOR" enabled_by_default="false" />
+    <inspection_tool class="AlibabaThreadLocalShouldRemove" enabled="false" level="CRITICAL" enabled_by_default="false" />
+    <inspection_tool class="AlibabaThreadPoolCreation" enabled="false" level="BLOCKER" enabled_by_default="false" />
+    <inspection_tool class="AlibabaThreadShouldSetName" enabled="false" level="CRITICAL" enabled_by_default="false" />
+    <inspection_tool class="AlibabaTransactionMustHaveRollback" enabled="false" level="MAJOR" enabled_by_default="false" />
+    <inspection_tool class="AlibabaUndefineMagicConstant" enabled="false" level="MAJOR" enabled_by_default="false" />
+    <inspection_tool class="AlibabaUnsupportedExceptionWithModifyAsList" enabled="false" level="CRITICAL" enabled_by_default="false" />
+    <inspection_tool class="AlibabaUseQuietReferenceNotation" enabled="false" level="MAJOR" enabled_by_default="false" />
+    <inspection_tool class="AlibabaUseRightCaseForDateFormat" enabled="false" level="CRITICAL" enabled_by_default="false" />
+    <inspection_tool class="JavaDoc" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="TOP_LEVEL_CLASS_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="" />
+        </value>
+      </option>
+      <option name="INNER_CLASS_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="" />
+        </value>
+      </option>
+      <option name="METHOD_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="@return@param@throws or @exception" />
+        </value>
+      </option>
+      <option name="FIELD_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="" />
+        </value>
+      </option>
+      <option name="IGNORE_DEPRECATED" value="false" />
+      <option name="IGNORE_JAVADOC_PERIOD" value="true" />
+      <option name="IGNORE_DUPLICATED_THROWS" value="false" />
+      <option name="IGNORE_POINT_TO_ITSELF" value="false" />
+      <option name="myAdditionalJavadocTags" value="date" />
+    </inspection_tool>
+    <inspection_tool class="MapOrSetKeyShouldOverrideHashCodeEquals" enabled="false" level="CRITICAL" enabled_by_default="false" />
+  </profile>
+</component>
\ No newline at end of file
diff --git a/.idea/markdown-navigator.xml b/.idea/markdown-navigator.xml
new file mode 100644
index 0000000..49648a5
--- /dev/null
+++ b/.idea/markdown-navigator.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MarkdownProjectSettings" wasCopied="true">
+    <PreviewSettings splitEditorLayout="SPLIT" splitEditorPreview="PREVIEW" useGrayscaleRendering="false" zoomFactor="1.0" maxImageWidth="0" showGitHubPageIfSynced="false" allowBrowsingInPreview="false" synchronizePreviewPosition="true" highlightPreviewType="NONE" highlightFadeOut="5" highlightOnTyping="true" synchronizeSourcePosition="true" verticallyAlignSourceAndPreviewSyncPosition="true" showSearchHighlightsInPreview="false" showSelectionInPreview="true" openRemoteLinks="true" replaceUnicodeEmoji="false" lastLayoutSetsDefault="false">
+      <PanelProvider>
+        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.panel" providerName="Default - Swing" />
+      </PanelProvider>
+    </PreviewSettings>
+    <ParserSettings gitHubSyntaxChange="false" emojiShortcuts="0" emojiImages="0">
+      <PegdownExtensions>
+        <option name="ABBREVIATIONS" value="false" />
+        <option name="ANCHORLINKS" value="true" />
+        <option name="ASIDE" value="false" />
+        <option name="ATXHEADERSPACE" value="true" />
+        <option name="AUTOLINKS" value="false" />
+        <option name="DEFINITIONS" value="false" />
+        <option name="DEFINITION_BREAK_DOUBLE_BLANK_LINE" value="false" />
+        <option name="FENCED_CODE_BLOCKS" value="true" />
+        <option name="FOOTNOTES" value="false" />
+        <option name="HARDWRAPS" value="false" />
+        <option name="HTML_DEEP_PARSER" value="false" />
+        <option name="INSERTED" value="false" />
+        <option name="QUOTES" value="false" />
+        <option name="RELAXEDHRULES" value="true" />
+        <option name="SMARTS" value="false" />
+        <option name="STRIKETHROUGH" value="true" />
+        <option name="SUBSCRIPT" value="false" />
+        <option name="SUPERSCRIPT" value="false" />
+        <option name="SUPPRESS_HTML_BLOCKS" value="false" />
+        <option name="SUPPRESS_INLINE_HTML" value="false" />
+        <option name="TABLES" value="true" />
+        <option name="TASKLISTITEMS" value="true" />
+        <option name="TOC" value="false" />
+        <option name="WIKILINKS" value="true" />
+      </PegdownExtensions>
+      <ParserOptions>
+        <option name="ADMONITION_EXT" value="false" />
+        <option name="ATTRIBUTES_EXT" value="false" />
+        <option name="COMMONMARK_LISTS" value="true" />
+        <option name="DUMMY" value="false" />
+        <option name="EMOJI_SHORTCUTS" value="true" />
+        <option name="ENUMERATED_REFERENCES_EXT" value="false" />
+        <option name="FLEXMARK_FRONT_MATTER" value="false" />
+        <option name="GFM_LOOSE_BLANK_LINE_AFTER_ITEM_PARA" value="false" />
+        <option name="GFM_TABLE_RENDERING" value="true" />
+        <option name="GITBOOK_URL_ENCODING" value="false" />
+        <option name="GITHUB_LISTS" value="false" />
+        <option name="GITHUB_WIKI_LINKS" value="true" />
+        <option name="GITLAB_EXT" value="false" />
+        <option name="GITLAB_MATH_EXT" value="false" />
+        <option name="GITLAB_MERMAID_EXT" value="false" />
+        <option name="HEADER_ID_NON_ASCII_TO_LOWERCASE" value="false" />
+        <option name="HEADER_ID_NO_DUPED_DASHES" value="false" />
+        <option name="JEKYLL_FRONT_MATTER" value="false" />
+        <option name="MACROS_EXT" value="false" />
+        <option name="NO_TEXT_ATTRIBUTES" value="false" />
+        <option name="PARSE_HTML_ANCHOR_ID" value="false" />
+        <option name="PLANTUML_FENCED_CODE" value="false" />
+        <option name="PUML_FENCED_CODE" value="false" />
+        <option name="SIM_TOC_BLANK_LINE_SPACER" value="true" />
+      </ParserOptions>
+    </ParserSettings>
+    <HtmlSettings headerTopEnabled="false" headerBottomEnabled="false" bodyTopEnabled="false" bodyBottomEnabled="false" embedUrlContent="false" addPageHeader="true" embedImages="false" embedHttpImages="false" imageUriSerials="false" addDocTypeHtml="true" noParaTags="false" plantUmlConversion="0" mathConversion="-1">
+      <GeneratorProvider>
+        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.generator" providerName="Default Swing HTML Generator" />
+      </GeneratorProvider>
+      <headerTop />
+      <headerBottom />
+      <bodyTop />
+      <bodyBottom />
+    </HtmlSettings>
+    <CssSettings previewScheme="UI_SCHEME" cssUri="" isCssUriEnabled="false" isCssUriSerial="false" isCssTextEnabled="false" isDynamicPageWidth="true">
+      <StylesheetProvider>
+        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.css" providerName="Default Swing Stylesheet" />
+      </StylesheetProvider>
+      <ScriptProviders />
+      <cssText />
+      <cssUriHistory />
+    </CssSettings>
+    <AnnotatorSettings targetHasSpaces="true" linkCaseMismatch="true" wikiCaseMismatch="true" wikiLinkHasDashes="true" notUnderWikiHome="true" targetNotWikiPageExt="true" notUnderSourceWikiHome="true" targetNameHasAnchor="true" targetPathHasAnchor="true" wikiLinkHasSlash="true" wikiLinkHasSubdir="true" wikiLinkHasOnlyAnchor="true" linkTargetsWikiHasExt="true" linkTargetsWikiHasBadExt="true" notUnderSameRepo="true" targetNotUnderVcs="false" linkNeedsExt="true" linkHasBadExt="true" linkTargetNeedsExt="true" linkTargetHasBadExt="true" wikiLinkNotInWiki="true" imageTargetNotInRaw="true" repoRelativeAcrossVcsRoots="true" multipleWikiTargetsMatch="true" unresolvedLinkReference="true" linkIsIgnored="true" anchorIsIgnored="true" anchorIsUnresolved="true" anchorLineReferenceIsUnresolved="true" anchorLineReferenceFormat="true" anchorHasDuplicates="true" abbreviationDuplicates="true" abbreviationNotUsed="true" attributeIdDuplicateDefinition="true" attributeIdNotUsed="true" footnoteDuplicateDefinition="true" footnoteUnresolved="true" footnoteDuplicates="true" footnoteNotUsed="true" macroDuplicateDefinition="true" macroUnresolved="true" macroDuplicates="true" macroNotUsed="true" referenceDuplicateDefinition="true" referenceUnresolved="true" referenceDuplicates="true" referenceNotUsed="true" referenceUnresolvedNumericId="true" enumRefDuplicateDefinition="true" enumRefUnresolved="true" enumRefDuplicates="true" enumRefNotUsed="true" enumRefLinkUnresolved="true" enumRefLinkDuplicates="true" simTocUpdateNeeded="true" simTocTitleSpaceNeeded="true" />
+    <HtmlExportSettings updateOnSave="false" parentDir="" targetDir="" cssDir="css" scriptDir="js" plainHtml="false" imageDir="" copyLinkedImages="false" imageUniquifyType="0" targetPathType="2" targetExt="" useTargetExt="false" noCssNoScripts="false" useElementStyleAttribute="false" linkToExportedHtml="true" exportOnSettingsChange="true" regenerateOnProjectOpen="false" linkFormatType="HTTP_ABSOLUTE" />
+    <LinkMapSettings>
+      <textMaps />
+    </LinkMapSettings>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file

From f1f6e5def2c1a1fea3792bddcd414a380af9e2af Mon Sep 17 00:00:00 2001
From: kongzue <myzcxhh@live.cn>
Date: Wed, 15 Jan 2020 16:23:51 +0800
Subject: [PATCH 07/18] 6.7.4 pub

---
 .idea/caches/build_file_checksums.ser         | Bin 592 -> 592 bytes
 baseframework/build.gradle                    |   6 +-
 .../kongzue/baseframework/BaseActivity.java   |  21 ++++--
 .../kongzue/baseframework/BaseFragment.java   |   8 +--
 .../interfaces/GlobalLifeCircleListener.java  |   4 +-
 .../baseframework/util/AppManager.java        |  37 ++++++++--
 .../util/FragmentChangeUtil.java              |   4 +-
 .../baseframework/util/Preferences.java       |  65 +++++++++++++++++-
 8 files changed, 121 insertions(+), 24 deletions(-)

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 82531c19c89dd7601582ecfbd517d2be6c34152b..97bc3d0418aa3147d472aec338459ef9136b087b 100644
GIT binary patch
delta 37
vcmV+=0NVf11kePKmj!RAN_l#*oOJ;Z@77O)ri%X_(XVpW+yj%%lOX~xP(%^T

delta 37
vcmV+=0NVf11kePKmj!ODUHVe7oOJ;ZLevGIUF6v4rh`+6xindrlOX~xN*oaG

diff --git a/baseframework/build.gradle b/baseframework/build.gradle
index 28f0b10..8ed0450 100644
--- a/baseframework/build.gradle
+++ b/baseframework/build.gradle
@@ -6,7 +6,7 @@ def siteUrl = 'https://github.com/kongzue/BaseFramework' //项目在github主页
 def gitUrl = 'https://github.com/kongzue/BaseFramework.git'   //Git仓库的地址
 
 group = "com.kongzue.baseframeworkx"//发布aar前缀根节点
-version = "6.7.3"//发布aar的库版本
+version = "6.7.4"//发布aar的库版本
 
 android {
     compileSdkVersion 29
@@ -14,8 +14,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 29
-        versionCode 107
-        versionName "6.7.3"
+        versionCode 109
+        versionName "6.7.4"
     }
 
     buildTypes {
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java b/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java
index eb40b6a..ba5feb4 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java
@@ -149,10 +149,7 @@ protected void onCreate(Bundle savedInstanceState) {
         AppManager.getInstance().pushActivity(me);
         
         initViews();
-        if (fragmentLayoutId != -1) {
-            fragmentChangeUtil = new FragmentChangeUtil(this, fragmentLayoutId);
-            initFragment(fragmentChangeUtil);
-        }
+        initFragments();
         bindAutoEvent();
         initBindViewAndFunctions();
         initDatas(getParameter());
@@ -166,6 +163,13 @@ protected void onCreate(Bundle savedInstanceState) {
         }
     }
     
+    private void initFragments() {
+        if (fragmentLayoutId != -1) {
+            fragmentChangeUtil = new FragmentChangeUtil(this, fragmentLayoutId);
+            initFragment(fragmentChangeUtil);
+        }
+    }
+    
     protected void initBindViewAndFunctions() {
         try {
             Field[] fields = getClass().getDeclaredFields();
@@ -348,12 +352,16 @@ public void initFragment(FragmentChangeUtil fragmentChangeUtil) {
     public void changeFragment(int index) {
         if (fragmentChangeUtil != null) {
             fragmentChangeUtil.show(index);
+        }else{
+            initFragments();
         }
     }
     
     public void changeFragment(int index, int enterAnimResId, int exitAnimResId) {
         if (fragmentChangeUtil != null) {
             fragmentChangeUtil.anim(enterAnimResId, exitAnimResId).show(index);
+        }else{
+            initFragments();
         }
     }
     
@@ -662,7 +670,7 @@ public void log(final Object obj) {
         }
     }
     
-    public void error(final Object obj) {
+    public void errorLog(final Object obj) {
         try {
             if (DEBUGMODE) {
                 String msg = obj.toString();
@@ -1255,6 +1263,7 @@ protected void onResume() {
         if (globalLifeCircleListener != null) {
             globalLifeCircleListener.onResume(me, me.getClass().getName());
         }
+        AppManager.setActiveActivity(this);
     }
     
     @Override
@@ -1511,7 +1520,7 @@ public View getRootView() {
     public void onWindowFocusChanged(boolean hasFocus) {
         super.onWindowFocusChanged(hasFocus);
         if (globalLifeCircleListener != null) {
-            globalLifeCircleListener.WindowFocus(me, me.getClass().getName(), hasFocus);
+            globalLifeCircleListener.windowFocus(me, me.getClass().getName(), hasFocus);
         }
     }
 }
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java b/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java
index ed5c60d..52af9dc 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java
@@ -41,7 +41,6 @@
  * @link: http://kongzue.com/
  * @describe: 自动化代码流水线作业，以及对原生安卓、MIUI、flyme的透明状态栏显示灰色图标文字的支持，同时提供一些小工具简化开发难度，详细说明文档：https://github.com/kongzue/BaseFramework
  */
-
 public abstract class BaseFragment<ME extends BaseActivity> extends Fragment {
     
     public int layoutResId = -1;
@@ -258,8 +257,8 @@ public void log(final Object obj) {
         me.log(obj);
     }
     
-    public void error(final Object obj) {
-        me.error(obj);
+    public void errorLog(final Object obj) {
+        me.errorLog(obj);
     }
     
     //位移动画
@@ -689,4 +688,5 @@ public boolean isAddedCompat() {
         return mAdded;
     }
     
-}
\ No newline at end of file
+}
+
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/interfaces/GlobalLifeCircleListener.java b/baseframework/src/main/java/com/kongzue/baseframework/interfaces/GlobalLifeCircleListener.java
index 130bc1f..a3d4924 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/interfaces/GlobalLifeCircleListener.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/interfaces/GlobalLifeCircleListener.java
@@ -19,7 +19,7 @@ public abstract class GlobalLifeCircleListener {
     
     public abstract void onDestroy(BaseActivity me, String className);
     
-    public void WindowFocus(BaseActivity me, String className, boolean hasFocus) {
+    public void windowFocus(BaseActivity me, String className, boolean hasFocus) {
     
     }
-}
\ No newline at end of file
+}
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/AppManager.java b/baseframework/src/main/java/com/kongzue/baseframework/util/AppManager.java
index 2ffc001..7790b1a 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/util/AppManager.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/util/AppManager.java
@@ -7,6 +7,7 @@
 import com.kongzue.baseframework.BaseActivity;
 
 import java.lang.ref.ReferenceQueue;
+import java.lang.ref.WeakReference;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Iterator;
@@ -25,6 +26,7 @@ public class AppManager {
     private static OnActivityStatusChangeListener onActivityStatusChangeListener;
     private static Stack<BaseActivity> activityStack;
     private static AppManager instance;
+    private static WeakReference<BaseActivity> activeActivity;
     
     private AppManager() {
     }
@@ -56,6 +58,9 @@ public void pushActivity(BaseActivity activity) {
      * 获取当前Activity（堆栈中最后一个压入的）
      */
     public BaseActivity currentActivity() {
+        if (activityStack == null) {
+            return null;
+        }
         BaseActivity activity = null;
         if (!activityStack.empty()) {
             activity = activityStack.lastElement();
@@ -63,10 +68,22 @@ public BaseActivity currentActivity() {
         return activity;
     }
     
+    /**
+     * 获取当前处于活动状态的Activity
+     *
+     * @return
+     */
+    public BaseActivity getActiveActivity() {
+        return activeActivity.get();
+    }
+    
     /**
      * 结束当前Activity（堆栈中最后一个压入的）
      */
     public void finishActivity() {
+        if (activityStack == null) {
+            return;
+        }
         BaseActivity activity = activityStack.lastElement();
         killActivity(activity);
     }
@@ -75,7 +92,7 @@ public void finishActivity() {
      * 结束指定的Activity
      */
     public void killActivity(BaseActivity activity) {
-        if (activity != null) {
+        if (activity != null && activityStack != null) {
             if (activity != null) {
                 activity.finishActivity();
             }
@@ -88,6 +105,9 @@ public void killActivity(BaseActivity activity) {
      * 结束指定类名的Activity
      */
     public void killActivity(Class<?> cls) {
+        if (activityStack == null) {
+            return;
+        }
         Iterator<BaseActivity> iterator = activityStack.iterator();
         BaseActivity temp = null;
         while (iterator.hasNext()) {
@@ -134,8 +154,8 @@ public void AppExit(Context context) {
     }
     
     public void deleteActivity(BaseActivity activity) {
-        try{
-            if (activity != null) {
+        try {
+            if (activity != null && activityStack != null) {
                 activityStack.remove(activity);
                 if (onActivityStatusChangeListener != null) {
                     onActivityStatusChangeListener.onActivityDestroy(activity);
@@ -144,7 +164,7 @@ public void deleteActivity(BaseActivity activity) {
                     }
                 }
             }
-        }catch (Exception e){
+        } catch (Exception e) {
         
         }
     }
@@ -179,6 +199,9 @@ public void killOtherActivityExclude(Class<?>... cls) {
      * @param cls activity
      */
     public BaseActivity getActivityInstance(Class<?> cls) {
+        if (activityStack == null) {
+            return null;
+        }
         if (!activityStack.empty()) {
             Stack<BaseActivity> reverseList = new Stack<BaseActivity>();
             reverseList.addAll(activityStack);
@@ -221,4 +244,8 @@ public interface OnActivityStatusChangeListener {
         
         void onAllActivityClose();
     }
-}
\ No newline at end of file
+    
+    public static void setActiveActivity(BaseActivity activeActivity) {
+        AppManager.activeActivity = new WeakReference<>(activeActivity);
+    }
+}
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/FragmentChangeUtil.java b/baseframework/src/main/java/com/kongzue/baseframework/util/FragmentChangeUtil.java
index ab70369..7b8e277 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/util/FragmentChangeUtil.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/util/FragmentChangeUtil.java
@@ -227,7 +227,7 @@ public int getCount() {
         return fragmentList.size();
     }
     
-    public Fragment getFocusFragment() {
+    public BaseFragment getFocusFragment() {
         return focusFragment;
     }
     
@@ -301,4 +301,4 @@ public FragmentChangeUtil anim(int enterAnimResId, int exitAnimResId) {
         this.exitAnimResId = exitAnimResId;
         return this;
     }
-}
\ No newline at end of file
+}
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/Preferences.java b/baseframework/src/main/java/com/kongzue/baseframework/util/Preferences.java
index 1febe65..68f2be0 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/util/Preferences.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/util/Preferences.java
@@ -9,11 +9,11 @@
  * Version 2.0
  * Update 2018.5.27
  */
-
 public class Preferences {
     
     private static Preferences preferences;
     private SharedPreferences sp;
+    private ChangeSharedPreferencesPathCallBack changeSharedPreferencesPathCallBack;
     
     private Preferences() {
     }
@@ -223,10 +223,71 @@ public void cleanAll(Context context, String path) {
     private void initSharedPreferences(Context context, String path) {
         if (sp == null) {
             sp = context.getApplicationContext().getSharedPreferences(path, Context.MODE_PRIVATE);
+        } else {
+            if (changeSharedPreferencesPathCallBack!=null) {
+                sp = changeSharedPreferencesPathCallBack.onPathChange(path);
+            }
         }
     }
     
-    public void initSharedPreferences(SharedPreferences sp) {
+    /**
+     * 获取 SharedPreferences 实例
+     * @return SharedPreferences实例对象
+     */
+    public SharedPreferences getSharedPreferences() {
+        return sp;
+    }
+    
+    /**
+     * ChangeSharedPreferencesPathCallBack 是用于切换 SharedPreferences 路径的回调函数，
+     * 请返回已切换至指定 Path 后的 SharedPreferences 对象。
+     * 一般可使用以下代码：
+     * return Preferences.getInstance().getSharedPreferences().getSharedPreferences(path, Context.MODE_PRIVATE);
+     *
+     * 完成切换操作，实际可能需要根据 SharedPreferences 实例的实际情况决定。
+     *
+     */
+    public interface ChangeSharedPreferencesPathCallBack {
+        SharedPreferences onPathChange(String path);
+    }
+    
+    /**
+     * 此方法已废弃，原因是原方法需要单独指定 ChangeSharedPreferencesPathCallBack。
+     * ChangeSharedPreferencesPathCallBack 是用于切换 SharedPreferences 路径的回调函数，
+     * 如果要自定义 SharedPreferences 实例，一定要指定 ChangeSharedPreferencesPathCallBack 切换方法，
+     * 否则可能导致无法切换至指定 Path
+     *
+     * @param sp    自定义 SharedPreferences 实例
+     * @return      继续执行其他方法
+     */
+    @Deprecated
+    public Preferences initSharedPreferences(SharedPreferences sp) {
+        this.sp = sp;
+        return this;
+    }
+    
+    /**
+     * 初始化自定义 SharedPreferences 实例，要执行此方法请务必于开始任何读写操作前进行。
+     * ChangeSharedPreferencesPathCallBack 是用于切换 SharedPreferences 路径的回调函数，
+     * 如果要自定义 SharedPreferences 实例，一定要指定 ChangeSharedPreferencesPathCallBack 切换方法，
+     * 否则可能导致无法切换至指定 Path
+     *
+     * @param sp                                        自定义 SharedPreferences 实例
+     * @param changeSharedPreferencesPathCallBack       ChangeSharedPreferencesPathCallBack 回调
+     * @return                                          继续执行其他方法
+     */
+    public Preferences initSharedPreferences(SharedPreferences sp, ChangeSharedPreferencesPathCallBack changeSharedPreferencesPathCallBack) {
         this.sp = sp;
+        this.changeSharedPreferencesPathCallBack = changeSharedPreferencesPathCallBack;
+        return this;
+    }
+    
+    public ChangeSharedPreferencesPathCallBack getChangeSharedPreferencesPathCallBack() {
+        return changeSharedPreferencesPathCallBack;
+    }
+    
+    public Preferences setChangeSharedPreferencesPathCallBack(ChangeSharedPreferencesPathCallBack changeSharedPreferencesPathCallBack) {
+        this.changeSharedPreferencesPathCallBack = changeSharedPreferencesPathCallBack;
+        return this;
     }
 }
\ No newline at end of file

From ec40be48a2d2e44a861b16b21d7038748af547b7 Mon Sep 17 00:00:00 2001
From: kongzue <myzcxhh@live.cn>
Date: Mon, 9 Mar 2020 12:53:29 +0800
Subject: [PATCH 08/18] 6.7.4.1 ready

---
 .idea/caches/build_file_checksums.ser         | Bin 592 -> 592 bytes
 .idea/caches/gradle_models.ser                | Bin 165556 -> 165566 bytes
 baseframework/build.gradle                    |   4 ++--
 .../kongzue/baseframework/BaseActivity.java   |  11 +++++++--
 .../kongzue/baseframework/BaseFragment.java   |  21 ++++++++----------
 5 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 97bc3d0418aa3147d472aec338459ef9136b087b..820486027fefbae052d092cffd4c7674a2406501 100644
GIT binary patch
delta 37
tcmcb>a)D*Sbk>5s?ZK-y&M9RS*!()E)Ur0=;l68G)}l;}>5~<i^Z`P157Gbt

delta 37
vcmV+=0NVf11kePKmj!RAN_l#*oOJ;Z@77O)ri%X_(XVpW+yj%%lOX~xP(%^T

diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
index fe080f7262fa5511af290ba0c6439f264e49925f..d45fdf5dc1c710f5a00b7d951faf6d9a501bd6dd 100644
GIT binary patch
delta 270
zcmdne%eAkUYXdhQOGfAMJDd6WrW>+^o#2}{d6m69znZgEOlWaxQE^OeWmR&;^fUJu
zWjBAczsksR{QBYY=2MQ_PdPFQ>a*}BFPpLbegR`48;ia}V)*uuaz-;Jmgnc1wr}s-
z$*3gGa=qN>%JjqtCeiIDFEB3PV9{UJRXRQQCS#pwZV3asnVz|xiJoC`AwwNQX7uj=
zw<b4AN=)ByjL~en&n?Dy7FCdgfRaqSAQg#Vb)qE<SX@`i(h_iK!sJtq^4nAHGqzQ*
vbllGUHy!9Qv+XJoOdpsyLCymj!uDYL##xM_+l```o^pX*vt2rkX{G`I=4@yZ

delta 252
zcmdnj%eAGKYXdhQ3+uscm7DqbrW>*>^gAFod6m69x016}jALF(QGRC1<{S2(7+F*|
zRyj=fzt1S&{MK>%TSvxEdTftlG87pLCJVk6p3WP=q_|zOkkOirMSQPG-u8%cMl&at
z(`%EaY@f7~QAwO7wselr^!k~MqTA12U|hh#;=rYCJiYKHV;yI92?MK{p1Gd!_Fp#{
zx3egMoKVP6$HWUH7!r#?q-Y5Pl6xlKu$P_w`5t2gONPd$>Dz&BT3W#tcSXM);+E||
iw+J$Gf}8==%l2S$qol}o>u9EDTwqJLtEMr{Q~&_%Us!<v

diff --git a/baseframework/build.gradle b/baseframework/build.gradle
index 8ed0450..ef599ab 100644
--- a/baseframework/build.gradle
+++ b/baseframework/build.gradle
@@ -6,7 +6,7 @@ def siteUrl = 'https://github.com/kongzue/BaseFramework' //项目在github主页
 def gitUrl = 'https://github.com/kongzue/BaseFramework.git'   //Git仓库的地址
 
 group = "com.kongzue.baseframeworkx"//发布aar前缀根节点
-version = "6.7.4"//发布aar的库版本
+version = "6.7.4.1"//发布aar的库版本
 
 android {
     compileSdkVersion 29
@@ -15,7 +15,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 29
         versionCode 109
-        versionName "6.7.4"
+        versionName "6.7.4.1"
     }
 
     buildTypes {
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java b/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java
index ba5feb4..f5a79f3 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java
@@ -19,6 +19,7 @@
 import android.os.Environment;
 import android.os.Handler;
 import android.provider.Settings;
+
 import androidx.annotation.ColorInt;
 import androidx.annotation.ColorRes;
 import androidx.annotation.NonNull;
@@ -27,6 +28,7 @@
 import androidx.core.app.SharedElementCallback;
 import androidx.core.content.ContextCompat;
 import androidx.appcompat.app.AppCompatActivity;
+
 import android.telephony.TelephonyManager;
 import android.util.DisplayMetrics;
 import android.util.Log;
@@ -134,6 +136,7 @@ protected void onCreate(Bundle savedInstanceState) {
         isAlive = true;
         
         initAttributes();
+        layoutResId = resetLayoutResId();
         if (layoutResId == android.R.layout.list_content) {
             Log.e("警告！", "请在您的Activity的Class上注解：@Layout(你的layout资源id)");
             return;
@@ -163,6 +166,10 @@ protected void onCreate(Bundle savedInstanceState) {
         }
     }
     
+    protected int resetLayoutResId() {
+        return layoutResId;
+    }
+    
     private void initFragments() {
         if (fragmentLayoutId != -1) {
             fragmentChangeUtil = new FragmentChangeUtil(this, fragmentLayoutId);
@@ -352,7 +359,7 @@ public void initFragment(FragmentChangeUtil fragmentChangeUtil) {
     public void changeFragment(int index) {
         if (fragmentChangeUtil != null) {
             fragmentChangeUtil.show(index);
-        }else{
+        } else {
             initFragments();
         }
     }
@@ -360,7 +367,7 @@ public void changeFragment(int index) {
     public void changeFragment(int index, int enterAnimResId, int exitAnimResId) {
         if (fragmentChangeUtil != null) {
             fragmentChangeUtil.anim(enterAnimResId, exitAnimResId).show(index);
-        }else{
+        } else {
             initFragments();
         }
     }
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java b/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java
index 52af9dc..02e83b3 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java
@@ -5,6 +5,7 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+
 import androidx.annotation.ColorRes;
 import androidx.annotation.IdRes;
 import androidx.annotation.Nullable;
@@ -84,18 +85,15 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
         this.savedInstanceState = savedInstanceState;
         try {
             Layout layout = getClass().getAnnotation(Layout.class);
-            if (layout == null) {
-                layoutResId = getLayout();
+            if (layout != null && layout.value() != -1) {
+                layoutResId = layout.value();
             } else {
-                if (layout.value() != -1) {
-                    layoutResId = layout.value();
-                } else {
-                    throw new Exception("请在您的Fragment的Class上注解：@Layout(你的layout资源id)");
-                }
+                throw new Exception("请在您的Fragment的Class上注解：@Layout(你的layout资源id)");
             }
         } catch (Exception e) {
             e.printStackTrace();
         }
+        layoutResId = resetLayoutResId();
         if (rootView == null) {
             rootView = LayoutInflater.from(getActivity()).inflate(layoutResId, container, false);
         }
@@ -112,6 +110,10 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
         return rootView;
     }
     
+    protected int resetLayoutResId() {
+        return layoutResId;
+    }
+    
     protected void initBindViewAndFunctions() {
         try {
             Field[] fields = getClass().getDeclaredFields();
@@ -189,11 +191,6 @@ public void setLifeCircleListener(LifeCircleListener lifeCircleListener) {
         this.lifeCircleListener = lifeCircleListener;
     }
     
-    //不再推荐使用，建议直接在Fragment上注解：@Layout(你的layout资源id)
-    @Deprecated
-    public int getLayout() {
-        return layoutResId;
-    }
     
     /**
      * initViews会在启动时首先执行，建议在此方法内进行布局绑定、View初始化等操作

From 679bac76967b48be29596b0255a7eebaf644713c Mon Sep 17 00:00:00 2001
From: kongzue <myzcxhh@live.cn>
Date: Thu, 23 Jul 2020 16:02:32 +0800
Subject: [PATCH 09/18] 6.7.5 pub

---
 .idea/caches/build_file_checksums.ser         | Bin 592 -> 592 bytes
 .idea/gradle.xml                              |   6 +-
 .idea/jarRepositories.xml                     |  25 ++
 .idea/misc.xml                                |   2 +-
 .../baseframeworkdemo/MainActivity.java       |  10 +-
 baseframework/build.gradle                    |   6 +-
 .../kongzue/baseframework/BaseActivity.java   | 134 ++++----
 .../com/kongzue/baseframework/BaseApp.java    | 313 ++++++++++++++----
 .../kongzue/baseframework/BaseFragment.java   |  73 +++-
 .../baseframework/BaseFrameworkSettings.java  | 101 +++++-
 .../interfaces/OnBugReportListener.java       |  12 +-
 .../baseframework/util/CycleRunner.java       |  64 ++++
 .../kongzue/baseframework/util/DebugLogG.java | 167 +++++++++-
 .../util/FragmentChangeUtil.java              |   8 +-
 .../baseframework/util/Preferences.java       | 207 +++++++-----
 15 files changed, 855 insertions(+), 273 deletions(-)
 create mode 100644 .idea/jarRepositories.xml
 create mode 100644 baseframework/src/main/java/com/kongzue/baseframework/util/CycleRunner.java

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 820486027fefbae052d092cffd4c7674a2406501..06ccf3e7e930620b4318472ead3b2df90e794f91 100644
GIT binary patch
delta 58
zcmV-A0LA~%1kePKmj!crs9b)roDl&K!EkA<8{@}qnfPiuy6_dblf3~{5ElWZH22Dc
QdQA8H?U9P$)RQ3sFCRx79{>OV

delta 58
zcmV-A0LA~%1kePKmj!UWhf}JtoDl&K)E$i3j{vd+>3|8C?D#@{lf3~{5VPx2bvb=t
Q;l9>tI~4+fXOkfUF9>}ZYybcN

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 1fffa31..2302033 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <compositeConfiguration>
-          <compositeBuild compositeDefinitionSource="SCRIPT" />
-        </compositeConfiguration>
+        <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
@@ -16,7 +15,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="testRunner" value="PLATFORM" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..a5f05cd
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c0f68ed..ea4df55 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -25,7 +25,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8 (2)" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/java/com/kongzue/baseframeworkdemo/MainActivity.java b/app/src/main/java/com/kongzue/baseframeworkdemo/MainActivity.java
index bce5765..e78c64e 100644
--- a/app/src/main/java/com/kongzue/baseframeworkdemo/MainActivity.java
+++ b/app/src/main/java/com/kongzue/baseframeworkdemo/MainActivity.java
@@ -88,9 +88,10 @@ public void initViews() {
     @Override
     public void initDatas(JumpParameter parameter) {
         BaseFrameworkSettings.turnOnReadErrorInfoPermissions(this, new OnBugReportListener() {
+            
             @Override
-            public void onReporter(final File file) {
-                log(file.getAbsolutePath());
+            public boolean onCrash(Exception e, final File crashLogFile) {
+                log(crashLogFile.getAbsolutePath());
                 runOnMain(new Runnable() {
                     @Override
                     public void run() {
@@ -100,19 +101,20 @@ public void run() {
                         builder.setPositiveButton("愿意", new DialogInterface.OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
-                                toast("请对file进行处理：" + file.getAbsolutePath());
+                                toast("请对file进行处理：" + crashLogFile.getAbsolutePath());
                             }
                         });
                         builder.setNegativeButton("不了", new DialogInterface.OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
-                            
+                    
                             }
                         });
                         AlertDialog dialog = builder.create();
                         dialog.show();
                     }
                 });
+                return false;
             }
         });
         
diff --git a/baseframework/build.gradle b/baseframework/build.gradle
index ef599ab..7378c7d 100644
--- a/baseframework/build.gradle
+++ b/baseframework/build.gradle
@@ -6,7 +6,7 @@ def siteUrl = 'https://github.com/kongzue/BaseFramework' //项目在github主页
 def gitUrl = 'https://github.com/kongzue/BaseFramework.git'   //Git仓库的地址
 
 group = "com.kongzue.baseframeworkx"//发布aar前缀根节点
-version = "6.7.4.1"//发布aar的库版本
+version = "6.7.5"//发布aar的库版本
 
 android {
     compileSdkVersion 29
@@ -14,8 +14,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 29
-        versionCode 109
-        versionName "6.7.4.1"
+        versionCode 110
+        versionName "6.7.5"
     }
 
     buildTypes {
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java b/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java
index f5a79f3..0937e3e 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java
@@ -58,6 +58,7 @@
 import com.kongzue.baseframework.interfaces.OnClick;
 import com.kongzue.baseframework.interfaces.SwipeBack;
 import com.kongzue.baseframework.util.AppManager;
+import com.kongzue.baseframework.util.CycleRunner;
 import com.kongzue.baseframework.util.DebugLogG;
 import com.kongzue.baseframework.util.FragmentChangeUtil;
 import com.kongzue.baseframework.util.JsonFormat;
@@ -86,6 +87,7 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
+import java.util.TimerTask;
 
 import static com.kongzue.baseframework.BaseFrameworkSettings.BETA_PLAN;
 import static com.kongzue.baseframework.BaseFrameworkSettings.DEBUGMODE;
@@ -127,6 +129,9 @@ public abstract class BaseActivity extends AppCompatActivity implements SwipeBac
     @Deprecated
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        if (BaseApp.getPrivateInstance() == null) {
+            BaseApp.setPrivateInstance(getApplication());
+        }
         mHelper = new SwipeBackActivityHelper(this);
         this.savedInstanceState = savedInstanceState;
         
@@ -136,13 +141,16 @@ protected void onCreate(Bundle savedInstanceState) {
         isAlive = true;
         
         initAttributes();
-        layoutResId = resetLayoutResId();
-        if (layoutResId == android.R.layout.list_content) {
-            Log.e("警告！", "请在您的Activity的Class上注解：@Layout(你的layout资源id)");
-            return;
+        
+        if (!interceptSetContentView()) {
+            layoutResId = resetLayoutResId();
+            if (layoutResId == android.R.layout.list_content) {
+                Log.e("警告！", "请在您的Activity的Class上注解：@Layout(你的layout资源id)");
+                return;
+            }
+            setContentView(layoutResId);
         }
         
-        setContentView(layoutResId);
         if (isFullScreen) {
             getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
             getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY | View.SYSTEM_UI_FLAG_FULLSCREEN);
@@ -166,12 +174,16 @@ protected void onCreate(Bundle savedInstanceState) {
         }
     }
     
+    public boolean interceptSetContentView() {
+        return false;
+    }
+    
     protected int resetLayoutResId() {
         return layoutResId;
     }
     
     private void initFragments() {
-        if (fragmentLayoutId != -1) {
+        if (fragmentLayoutId != -1 && fragmentChangeUtil == null) {
             fragmentChangeUtil = new FragmentChangeUtil(this, fragmentLayoutId);
             initFragment(fragmentChangeUtil);
         }
@@ -604,12 +616,13 @@ public static BuildProperties newInstance() throws IOException {
     private Toast toast;
     
     public void runOnMain(Runnable runnable) {
+        if (!isAlive) {
+            return;
+        }
         runOnUiThread(new Runnable() {
             @Override
             public void run() {
-                if (isAlive) {
-                    runnable.run();
-                }
+                runnable.run();
             }
         });
     }
@@ -624,7 +637,8 @@ public void run() {
     }
     
     public void runDelayed(Runnable runnable, long time) {
-        new Handler().postDelayed(new Runnable() {
+        Handler handler = new Handler();
+        handler.postDelayed(new Runnable() {
             @Override
             public void run() {
                 runnable.run();
@@ -632,6 +646,32 @@ public void run() {
         }, time);
     }
     
+    private List<CycleRunner> cycleTimerList = new ArrayList<>();
+    
+    public CycleRunner runCycle(Runnable runnable, long firstDelay, long interval) {
+        CycleRunner runner = new CycleRunner();
+        runner.schedule(new TimerTask() {
+            @Override
+            public void run() {
+                runnable.run();
+            }
+        }, firstDelay, interval);
+        cycleTimerList.add(runner);
+        return runner;
+    }
+    
+    public CycleRunner runOnMainCycle(Runnable runnable, long firstDelay, long interval) {
+        CycleRunner runner = new CycleRunner();
+        runner.schedule(new TimerTask() {
+            @Override
+            public void run() {
+                runOnMain(runnable);
+            }
+        }, firstDelay, interval);
+        cycleTimerList.add(runner);
+        return runner;
+    }
+    
     //简易吐司
     public void toast(final Object obj) {
         try {
@@ -657,45 +697,11 @@ public void toastS(final Object obj) {
     
     //简易Log
     public void log(final Object obj) {
-        try {
-            if (DEBUGMODE) {
-                String msg = obj.toString();
-                if (isNull(msg)) {
-                    return;
-                }
-                if (obj.toString().length() > 2048) {
-                    bigLog(msg);
-                } else {
-                    logG("log", msg);
-                    if (!JsonFormat.formatJson(msg)) {
-                        Log.v(">>>>>>", msg);
-                    }
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        DebugLogG.LogI(obj);
     }
     
     public void errorLog(final Object obj) {
-        try {
-            if (DEBUGMODE) {
-                String msg = obj.toString();
-                if (isNull(msg)) {
-                    return;
-                }
-                if (obj.toString().length() > 2048) {
-                    bigLog(msg);
-                } else {
-                    logG("log", msg);
-                    if (!JsonFormat.formatJson(msg)) {
-                        Log.e(">>>>>>", msg);
-                    }
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        DebugLogG.LogE(obj);
     }
     
     private void info(int level, String msg) {
@@ -1304,31 +1310,17 @@ protected void onDestroy() {
         if (globalLifeCircleListener != null) {
             globalLifeCircleListener.onDestroy(me, me.getClass().getName());
         }
+        for (CycleRunner runnable : cycleTimerList) {
+            if (!runnable.isCanceled()) {
+                runnable.cancel();
+            }
+        }
         super.onDestroy();
     }
     
     //大型打印使用，Log默认是有字数限制的，如有需要打印更长的文本可以使用此方法
     public void bigLog(String msg) {
-        Log.i(">>>bigLog", "BIGLOG.start=================================");
-        if (isNull(msg)) {
-            return;
-        }
-        logG("log", msg);
-        int strLength = msg.length();
-        int start = 0;
-        int end = 2000;
-        for (int i = 0; i < 100; i++) {
-            //剩下的文本还是大于规定长度则继续重复截取并输出
-            if (strLength > end) {
-                Log.v(">>>", msg.substring(start, end));
-                start = end;
-                end = end + 2000;
-            } else {
-                Log.v(">>>", msg.substring(start, strLength));
-                break;
-            }
-        }
-        Log.i(">>>bigLog", "BIGLOG.end=================================");
+        DebugLogG.bigLog(msg, false);
     }
     
     public static GlobalLifeCircleListener getGlobalLifeCircleListener() {
@@ -1344,9 +1336,7 @@ public static boolean DEBUGMODE() {
     }
     
     private void logG(String tag, Object o) {
-        if (BETA_PLAN) {
-            DebugLogG.LogG(me, tag + ">>>" + o.toString());
-        }
+        DebugLogG.LogG(tag + ">>>" + o.toString());
     }
     
     //使用默认浏览器打开链接
@@ -1530,4 +1520,10 @@ public void onWindowFocusChanged(boolean hasFocus) {
             globalLifeCircleListener.windowFocus(me, me.getClass().getName(), hasFocus);
         }
     }
+    
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.remove("android:support:fragments");
+    }
 }
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/BaseApp.java b/baseframework/src/main/java/com/kongzue/baseframework/BaseApp.java
index 1d872b3..504b6c8 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/BaseApp.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/BaseApp.java
@@ -20,6 +20,7 @@
 import android.view.WindowManager;
 import android.widget.Toast;
 
+import com.kongzue.baseframework.interfaces.OnBugReportListener;
 import com.kongzue.baseframework.interfaces.OnSDKInitializedCallBack;
 import com.kongzue.baseframework.util.AppManager;
 import com.kongzue.baseframework.util.DebugLogG;
@@ -55,6 +56,7 @@ public void initSDKInitialized() {
     }
     
     public YourApp me;
+    private static Application instance;
     
     @Override
     @Deprecated
@@ -62,6 +64,8 @@ public void onCreate() {
         super.onCreate();
         
         me = (YourApp) this;
+        instance = me;
+        
         init();
         new Thread() {
             @Override
@@ -95,74 +99,19 @@ public BaseApp<YourApp> setOnSDKInitializedCallBack(OnSDKInitializedCallBack onS
     }
     
     public void log(final Object obj) {
-        try {
-            if (DEBUGMODE) {
-                String msg = obj.toString();
-                if (isNull(msg)) {
-                    return;
-                }
-                if (obj.toString().length() > 2048) {
-                    bigLog(msg);
-                } else {
-                    logG("log", msg);
-                    if (!JsonFormat.formatJson(msg)) {
-                        Log.v(">>>>>>", msg);
-                    }
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        DebugLogG.LogI(obj);
     }
     
     public void error(final Object obj) {
-        try {
-            if (DEBUGMODE) {
-                String msg = obj.toString();
-                if (isNull(msg)) {
-                    return;
-                }
-                if (obj.toString().length() > 2048) {
-                    bigLog(msg);
-                } else {
-                    logG("log", msg);
-                    if (!JsonFormat.formatJson(msg)) {
-                        Log.e(">>>>>>", msg);
-                    }
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        DebugLogG.LogE(obj);
     }
     
     public void bigLog(String msg) {
-        Log.i(">>>bigLog", "BIGLOG.start=================================");
-        if (isNull(msg)) {
-            return;
-        }
-        logG("log", msg);
-        int strLength = msg.length();
-        int start = 0;
-        int end = 2000;
-        for (int i = 0; i < 100; i++) {
-            //剩下的文本还是大于规定长度则继续重复截取并输出
-            if (strLength > end) {
-                Log.v(">>>", msg.substring(start, end));
-                start = end;
-                end = end + 2000;
-            } else {
-                Log.v(">>>", msg.substring(start, strLength));
-                break;
-            }
-        }
-        Log.i(">>>bigLog", "BIGLOG.end=================================");
+        DebugLogG.bigLog(msg, false);
     }
     
     private void logG(String tag, Object o) {
-        if (BETA_PLAN) {
-            DebugLogG.LogG(me, tag + ">>>" + o.toString());
-        }
+        DebugLogG.LogG(tag + ">>>" + o.toString());
     }
     
     protected final static String NULL = "";
@@ -232,7 +181,7 @@ public int px2dip(float pxValue) {
     
     //启动当前应用设置页面
     public void startAppSettings() {
-        Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+        Intent intent = new Intent(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
         intent.setData(Uri.parse("package:" + getPackageName()));
         startActivity(intent);
     }
@@ -272,13 +221,14 @@ public int getDisplayHeight() {
     //获取底栏高度
     public int getNavbarHeight() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            try{
+            try {
                 WindowInsets windowInsets = null;
                 windowInsets = AppManager.getInstance().currentActivity().getWindow().getDecorView().getRootView().getRootWindowInsets();
                 if (windowInsets != null) {
                     return windowInsets.getStableInsetBottom();
                 }
-            }catch (Exception e){}
+            } catch (Exception e) {
+            }
         }
         int resourceId = 0;
         int rid = getResources().getIdentifier("config_showNavigationBar", "bool", "android");
@@ -354,4 +304,243 @@ public boolean isInstallApp(String packageName) {
         }
         return packageInfo != null;
     }
+    
+    public static Settings Settings(String path) {
+        return new Settings(path);
+    }
+    
+    /**
+     * 代理属性存储
+     */
+    public static class Settings {
+        
+        public static void init(com.kongzue.baseframework.util.Preferences.ChangeSharedPreferencesPathCallBack changeSharedPreferencesPathCallBack) {
+            com.kongzue.baseframework.util.Preferences.getInstance().setChangeSharedPreferencesPathCallBack(changeSharedPreferencesPathCallBack);
+        }
+        
+        private String path;
+        
+        public Settings(String path) {
+            this.path = path;
+        }
+        
+        public static void set(String path, String key, String value) {
+            com.kongzue.baseframework.util.Preferences.getInstance().set(instance, path, key, value);
+        }
+        
+        public static void set(String path, String key, boolean value) {
+            com.kongzue.baseframework.util.Preferences.getInstance().set(instance, path, key, value);
+        }
+        
+        public static void set(String path, String key, int value) {
+            com.kongzue.baseframework.util.Preferences.getInstance().set(instance, path, key, value);
+        }
+        
+        public static void set(String path, String key, float value) {
+            com.kongzue.baseframework.util.Preferences.getInstance().set(instance, path, key, value);
+        }
+        
+        public static void set(String path, String key, long value) {
+            com.kongzue.baseframework.util.Preferences.getInstance().set(instance, path, key, value);
+        }
+        
+        public static void set(String path, String key, double value) {
+            com.kongzue.baseframework.util.Preferences.getInstance().set(instance, path, key, value);
+        }
+        
+        public static void commit(String path, String key, String value) {
+            com.kongzue.baseframework.util.Preferences.getInstance().commit(instance, path, key, value);
+        }
+        
+        public static void commit(String path, String key, boolean value) {
+            com.kongzue.baseframework.util.Preferences.getInstance().commit(instance, path, key, value);
+        }
+        
+        public static void commit(String path, String key, int value) {
+            com.kongzue.baseframework.util.Preferences.getInstance().commit(instance, path, key, value);
+        }
+        
+        public static void commit(String path, String key, float value) {
+            com.kongzue.baseframework.util.Preferences.getInstance().commit(instance, path, key, value);
+        }
+        
+        public static void commit(String path, String key, long value) {
+            com.kongzue.baseframework.util.Preferences.getInstance().commit(instance, path, key, value);
+        }
+        
+        public static void commit(String path, String key, double value) {
+            com.kongzue.baseframework.util.Preferences.getInstance().commit(instance, path, key, value);
+        }
+        
+        public static String getString(String path, String key) {
+            return com.kongzue.baseframework.util.Preferences.getInstance().getString(instance, path, key);
+        }
+        
+        public static String getString(String path, String key, String defaultValue) {
+            return com.kongzue.baseframework.util.Preferences.getInstance().getString(instance, path, key, defaultValue);
+        }
+        
+        public static boolean getBoolean(String path, String key) {
+            return com.kongzue.baseframework.util.Preferences.getInstance().getBoolean(instance, path, key);
+        }
+        
+        public static boolean getBoolean(String path, String key, boolean defaultValue) {
+            return com.kongzue.baseframework.util.Preferences.getInstance().getBoolean(instance, path, key, defaultValue);
+        }
+        
+        public static int getInt(String path, String key) {
+            return com.kongzue.baseframework.util.Preferences.getInstance().getInt(instance, path, key);
+        }
+        
+        public static int getInt(String path, String key, int defaultValue) {
+            return com.kongzue.baseframework.util.Preferences.getInstance().getInt(instance, path, key, defaultValue);
+        }
+        
+        public static float getFloat(String path, String key) {
+            return com.kongzue.baseframework.util.Preferences.getInstance().getFloat(instance, path, key);
+        }
+        
+        public static float getFloat(String path, String key, float defaultValue) {
+            return com.kongzue.baseframework.util.Preferences.getInstance().getFloat(instance, path, key, defaultValue);
+        }
+        
+        public static long getLong(String path, String key) {
+            return com.kongzue.baseframework.util.Preferences.getInstance().getLong(instance, path, key);
+        }
+        
+        public static long getLong(String path, String key, long defaultValue) {
+            return com.kongzue.baseframework.util.Preferences.getInstance().getLong(instance, path, key, defaultValue);
+        }
+        
+        public static double getDouble(String path, String key) {
+            return com.kongzue.baseframework.util.Preferences.getInstance().getDouble(instance, path, key);
+        }
+        
+        public static double getDouble(String path, String key, double defaultValue) {
+            return com.kongzue.baseframework.util.Preferences.getInstance().getDouble(instance, path, key, defaultValue);
+        }
+        
+        public static void clean(String path) {
+            com.kongzue.baseframework.util.Preferences.getInstance().cleanAll(instance, path);
+        }
+        
+        public void set(String key, String value) {
+            Settings.set(path, key, value);
+        }
+        
+        public void set(String key, boolean value) {
+            Settings.set(path, key, value);
+        }
+        
+        public void set(String key, int value) {
+            Settings.set(path, key, value);
+        }
+        
+        public void set(String key, float value) {
+            Settings.set(path, key, value);
+        }
+        
+        public void set(String key, long value) {
+            Settings.set(path, key, value);
+        }
+        
+        public void set(String key, double value) {
+            Settings.set(path, key, value);
+        }
+        
+        public void commit(String key, String value) {
+            Settings.commit(path, key, value);
+        }
+        
+        public void commit(String key, boolean value) {
+            Settings.commit(path, key, value);
+        }
+        
+        public void commit(String key, int value) {
+            Settings.commit(path, key, value);
+        }
+        
+        public void commit(String key, float value) {
+            Settings.commit(path, key, value);
+        }
+        
+        public void commit(String key, long value) {
+            Settings.commit(path, key, value);
+        }
+        
+        public void commit(String key, double value) {
+            Settings.commit(path, key, value);
+        }
+        
+        public String getString(String key) {
+            return getString(path, key);
+        }
+        
+        public String getStringWithDefaultValue(String key, String defaultValue) {
+            return getString(path, key, defaultValue);
+        }
+        
+        public boolean getBoolean(String key) {
+            return getBoolean(path, key);
+        }
+        
+        public boolean getBoolean(String key, boolean defaultValue) {
+            return getBoolean(path, key, defaultValue);
+        }
+        
+        public int getInt(String key) {
+            return getInt(path, key);
+        }
+        
+        public int getInt(String key, int defaultValue) {
+            return getInt(path, key, defaultValue);
+        }
+        
+        public float getFloat(String key) {
+            return getFloat(path, key);
+        }
+        
+        public float getFloat(String key, float defaultValue) {
+            return getFloat(path, key, defaultValue);
+        }
+        
+        public long getLong(String key) {
+            return getLong(path, key);
+        }
+        
+        public long getLong(String key, long defaultValue) {
+            return getLong(path, key, defaultValue);
+        }
+        
+        public double getDouble(String key) {
+            return getDouble(path, key);
+        }
+        
+        public double getDouble(String key, double defaultValue) {
+            return getDouble(path, key, defaultValue);
+        }
+        
+        public void clean() {
+            clean(path);
+        }
+    }
+    
+    public static void setPrivateInstance(Application context) {
+        BaseApp.instance = context;
+    }
+    
+    public static Application getPrivateInstance() {
+        if (instance == null) {
+            return null;
+        }
+        return instance;
+    }
+    
+    public void setOnCrashListener(OnBugReportListener onBugReportListener) {
+        BaseFrameworkSettings.turnOnReadErrorInfoPermissions(this, onBugReportListener);
+    }
+    
+    public void exit() {
+        BaseFrameworkSettings.exitApp();
+    }
 }
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java b/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java
index 02e83b3..085cd1a 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java
@@ -22,6 +22,7 @@
 import com.kongzue.baseframework.interfaces.LifeCircleListener;
 import com.kongzue.baseframework.interfaces.Layout;
 import com.kongzue.baseframework.interfaces.OnClick;
+import com.kongzue.baseframework.util.CycleRunner;
 import com.kongzue.baseframework.util.JumpParameter;
 import com.kongzue.baseframework.util.OnPermissionResponseListener;
 import com.kongzue.baseframework.util.OnJumpResponseListener;
@@ -32,6 +33,7 @@
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.TimerTask;
 
 import static com.kongzue.baseframework.BaseFrameworkSettings.DEBUGMODE;
 
@@ -83,19 +85,23 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
         me = (ME) getActivity();
         THIS = this;
         this.savedInstanceState = savedInstanceState;
-        try {
-            Layout layout = getClass().getAnnotation(Layout.class);
-            if (layout != null && layout.value() != -1) {
-                layoutResId = layout.value();
-            } else {
-                throw new Exception("请在您的Fragment的Class上注解：@Layout(你的layout资源id)");
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        layoutResId = resetLayoutResId();
+        
+        rootView = interceptSetContentView();
         if (rootView == null) {
-            rootView = LayoutInflater.from(getActivity()).inflate(layoutResId, container, false);
+            try {
+                Layout layout = getClass().getAnnotation(Layout.class);
+                if (layout != null && layout.value() != -1) {
+                    layoutResId = layout.value();
+                } else {
+                    throw new Exception("请在您的Fragment的Class上注解：@Layout(你的layout资源id)");
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            layoutResId = resetLayoutResId();
+            if (rootView == null) {
+                rootView = LayoutInflater.from(getActivity()).inflate(layoutResId, container, false);
+            }
         }
         
         if (lifeCircleListener != null) {
@@ -110,6 +116,10 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
         return rootView;
     }
     
+    public View interceptSetContentView() {
+        return null;
+    }
+    
     protected int resetLayoutResId() {
         return layoutResId;
     }
@@ -191,6 +201,11 @@ public void setLifeCircleListener(LifeCircleListener lifeCircleListener) {
         this.lifeCircleListener = lifeCircleListener;
     }
     
+    //不再推荐使用，建议直接在Fragment上注解：@Layout(你的layout资源id)
+    @Deprecated
+    public int getLayout() {
+        return layoutResId;
+    }
     
     /**
      * initViews会在启动时首先执行，建议在此方法内进行布局绑定、View初始化等操作
@@ -494,6 +509,32 @@ public void runDelayed(Runnable runnable, long time) {
         me.runDelayed(runnable, time);
     }
     
+    private List<CycleRunner> cycleTimerList = new ArrayList<>();
+    
+    public CycleRunner runCycle(Runnable runnable, long firstDelay, long interval) {
+        CycleRunner runner = new CycleRunner();
+        runner.schedule(new TimerTask() {
+            @Override
+            public void run() {
+                runnable.run();
+            }
+        }, firstDelay, interval);
+        cycleTimerList.add(runner);
+        return runner;
+    }
+    
+    public CycleRunner runOnMainCycle(Runnable runnable, long firstDelay, long interval) {
+        CycleRunner runner = new CycleRunner();
+        runner.schedule(new TimerTask() {
+            @Override
+            public void run() {
+                runOnMain(runnable);
+            }
+        }, firstDelay, interval);
+        cycleTimerList.add(runner);
+        return runner;
+    }
+    
     /**
      * 复制文本到剪贴板
      *
@@ -570,6 +611,11 @@ public void onDestroy() {
         if (lifeCircleListener != null) {
             lifeCircleListener.onDestroy();
         }
+        for (CycleRunner runnable : cycleTimerList) {
+            if (!runnable.isCanceled()) {
+                runnable.cancel();
+            }
+        }
         super.onDestroy();
     }
     
@@ -685,5 +731,4 @@ public boolean isAddedCompat() {
         return mAdded;
     }
     
-}
-
+}
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/BaseFrameworkSettings.java b/baseframework/src/main/java/com/kongzue/baseframework/BaseFrameworkSettings.java
index ca7a300..11e667a 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/BaseFrameworkSettings.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/BaseFrameworkSettings.java
@@ -1,10 +1,13 @@
 package com.kongzue.baseframework;
 
 import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
 import android.util.Log;
 
 import com.kongzue.baseframework.interfaces.OnBugReportListener;
 import com.kongzue.baseframework.util.DebugLogG;
+import com.kongzue.baseframework.util.JsonFormat;
 import com.kongzue.baseframework.util.Preferences;
 
 import java.io.File;
@@ -19,8 +22,6 @@
  */
 public class BaseFrameworkSettings {
     
-    public static final String LINE_SEPARATOR = System.getProperty("line.separator");
-    
     private static OnBugReportListener onBugReportListener;
     
     //是否开启debug模式，此开关影响打印Log日志等行为
@@ -32,6 +33,8 @@ public class BaseFrameworkSettings {
     //语言设置
     public static Locale selectLocale;
     
+    private static boolean running = true;
+    
     //设置开启崩溃监听
     public static void turnOnReadErrorInfoPermissions(Context context, OnBugReportListener listener) {
         onBugReportListener = listener;
@@ -41,26 +44,100 @@ public static void turnOnReadErrorInfoPermissions(Context context, OnBugReportLi
             Preferences.getInstance().commit(context, "cache", "bugReporterFile", "");
         }
         
+        new Handler(Looper.getMainLooper()).post(new Runnable() {
+            @Override
+            public void run() {
+                while (running) {
+                    try {
+                        Looper.loop();
+                    } catch (Throwable e) {
+                        DebugLogG.catchException(e);
+                        if (onBugReportListener != null) {
+                            onBugReportListener.onReporter(new File(reporterFile));
+                            if (onBugReportListener.onCrash(new Exception(e), new File(reporterFile))){
+                                exitApp();
+                            }
+                        }
+                    }
+                }
+            }
+        });
+        
         Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
             @Override
             public void uncaughtException(Thread t, Throwable e) {
-                DebugLogG.catchException(context, t, e);
-                showInfo(e);
-                android.os.Process.killProcess(android.os.Process.myPid());
+                new Thread() {
+                    @Override
+                    public void run() {
+                        DebugLogG.catchException(e);
+                        
+                        if (onBugReportListener != null) {
+                            Looper.prepare();
+                            onBugReportListener.onReporter(new File(reporterFile));
+                            if (onBugReportListener.onCrash(new Exception(e), new File(reporterFile))){
+                                exitApp();
+                            }
+                            Looper.loop();
+                        }
+                        try {
+                            Thread.sleep(3000);
+                        } catch (InterruptedException ae) {
+                            ae.printStackTrace();
+                        }
+                        super.run();
+                    }
+                }.start();
             }
         });
     }
     
-    private static void showInfo(Throwable e) {
-        if (!DEBUGMODE) {
+    public static boolean setNavigationBarHeightZero = false;
+    
+    public static void log(Object s) {
+        if (DEBUGMODE) {
+            String logStr = String.valueOf(s);
+            if (logStr.length() > 2048) {
+                bigLog(logStr);
+            } else {
+                if (!JsonFormat.formatJson(logStr)) {
+                    Log.v(">>>>>>", logStr);
+                }
+            }
+            
+            Log.v(">>>>>>", logStr);
+        }
+    }
+    
+    public static void bigLog(String msg) {
+        Log.i(">>>bigLog", "BIGLOG.start=================================");
+        if (isNull(msg)) {
             return;
         }
-        String errorInfo = DebugLogG.getExceptionInfo(e);
-        String[] lines = errorInfo.split(LINE_SEPARATOR);
-        for (String line : lines) {
-            Log.e(">>>>>>", line);
+        int strLength = msg.length();
+        int start = 0;
+        int end = 2000;
+        for (int i = 0; i < 100; i++) {
+            //剩下的文本还是大于规定长度则继续重复截取并输出
+            if (strLength > end) {
+                Log.v(">>>", msg.substring(start, end));
+                start = end;
+                end = end + 2000;
+            } else {
+                Log.v(">>>", msg.substring(start, strLength));
+                break;
+            }
         }
+        Log.i(">>>bigLog", "BIGLOG.end=================================");
     }
     
-    public static boolean setNavigationBarHeightZero = false;
+    private static boolean isNull(String s) {
+        if (s == null || s.trim().isEmpty() || "null".equals(s) || "(null)".equals(s)) {
+            return true;
+        }
+        return false;
+    }
+    
+    public static void exitApp() {
+        android.os.Process.killProcess(android.os.Process.myPid());
+    }
 }
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/interfaces/OnBugReportListener.java b/baseframework/src/main/java/com/kongzue/baseframework/interfaces/OnBugReportListener.java
index 400db3d..d0ce02a 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/interfaces/OnBugReportListener.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/interfaces/OnBugReportListener.java
@@ -9,6 +9,12 @@
  * Mail: myzcxhh@live.cn
  * CreateTime: 2018/9/30 15:47
  */
-public interface OnBugReportListener {
-    void onReporter(File file);
-}
+public abstract class OnBugReportListener {
+    
+    @Deprecated
+    public void onReporter(File file) {
+    
+    }
+    
+    public abstract boolean onCrash(Exception e,File crashLogFile);
+}
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/CycleRunner.java b/baseframework/src/main/java/com/kongzue/baseframework/util/CycleRunner.java
new file mode 100644
index 0000000..8af91f5
--- /dev/null
+++ b/baseframework/src/main/java/com/kongzue/baseframework/util/CycleRunner.java
@@ -0,0 +1,64 @@
+package com.kongzue.baseframework.util;
+
+import java.util.Date;
+import java.util.Timer;
+import java.util.TimerTask;
+
+/**
+ * @author: Kongzue
+ * @github: https://github.com/kongzue/
+ * @homepage: http://kongzue.com/
+ * @mail: myzcxhh@live.cn
+ * @createTime: 2020/3/15 14:27
+ */
+public class CycleRunner extends Timer {
+    
+    private TimerTask timerTask;
+    private boolean isCanceled;
+    
+    public boolean isCanceled() {
+        return isCanceled;
+    }
+    
+    @Override
+    public void cancel() {
+        isCanceled = true;
+        super.cancel();
+    }
+    
+    @Override
+    public void schedule(TimerTask task, long delay) {
+        isCanceled = false;
+        super.schedule(task, delay);
+    }
+    
+    @Override
+    public void schedule(TimerTask task, Date time) {
+        isCanceled = false;
+        super.schedule(task, time);
+    }
+    
+    @Override
+    public void schedule(TimerTask task, long delay, long period) {
+        isCanceled = false;
+        super.schedule(task, delay, period);
+    }
+    
+    @Override
+    public void schedule(TimerTask task, Date firstTime, long period) {
+        isCanceled = false;
+        super.schedule(task, firstTime, period);
+    }
+    
+    @Override
+    public void scheduleAtFixedRate(TimerTask task, long delay, long period) {
+        isCanceled = false;
+        super.scheduleAtFixedRate(task, delay, period);
+    }
+    
+    @Override
+    public void scheduleAtFixedRate(TimerTask task, Date firstTime, long period) {
+        isCanceled = false;
+        super.scheduleAtFixedRate(task, firstTime, period);
+    }
+}
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/DebugLogG.java b/baseframework/src/main/java/com/kongzue/baseframework/util/DebugLogG.java
index eaf24bc..bcdb193 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/util/DebugLogG.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/util/DebugLogG.java
@@ -2,11 +2,21 @@
 
 import android.app.Application;
 import android.content.Context;
+import android.util.Log;
+
+import com.kongzue.baseframework.BaseApp;
 
 import java.io.File;
 import java.io.FileWriter;
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static com.kongzue.baseframework.BaseActivity.isNull;
+import static com.kongzue.baseframework.BaseFrameworkSettings.BETA_PLAN;
+import static com.kongzue.baseframework.BaseFrameworkSettings.DEBUGMODE;
 
 /**
  * LoGG 此类为日志活动监控类，负责记录活动日志，包含设备信息、Activity基本生命周期、使用log(...)语句输出的、使用toast(...)语句建立提示的、以及崩溃信息
@@ -19,13 +29,127 @@
  */
 public class DebugLogG {
     
+    public static final String LINE_SEPARATOR = System.getProperty("line.separator");
+    
     private static File logFile;
     private static FileWriter logWriter;
     
-    public static void LogG(Context context, String s) {
+    public static void LogI(Object obj) {
+        try {
+            if (DEBUGMODE) {
+                if (obj instanceof Map) {
+                    Log.v(">>>>>>", "Map: " + obj.getClass().getName() + "@" + Integer.toHexString(obj.hashCode()) + " {\n");
+                    Set keySet = ((Map) obj).keySet();
+                    for (Object key : keySet) {
+                        String keyStr = String.valueOf(key);
+                        String valueStr = String.valueOf(((Map) obj).get(key));
+                        Log.v(">>>>>>", "    \"" + keyStr + "\": \"" + valueStr + "\",");
+                    }
+                    Log.v(">>>>>>", "}");
+                } else if (obj instanceof List) {
+                    List list = (List) obj;
+                    Log.v(">>>>>>", "List: " + obj.getClass().getName() + "@" + Integer.toHexString(obj.hashCode()) + " [\n");
+                    for (Object value : list) {
+                        Log.v(">>>>>>", "    " + value + ",");
+                    }
+                    Log.v(">>>>>>", "]");
+                } else {
+                    String msg = String.valueOf(obj);
+                    if (isNull(msg)) {
+                        return;
+                    }
+                    if (obj.toString().length() > 2048) {
+                        bigLog(msg, false);
+                    } else {
+                        LogG(msg);
+                        if (!JsonFormat.formatJson(msg)) {
+                            Log.v(">>>>>>", msg);
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+    
+    public static void LogE(Object obj) {
+        try {
+            if (DEBUGMODE) {
+                if (obj instanceof Map) {
+                    Log.e(">>>>>>", "Map: " + obj.getClass().getName() + "@" + Integer.toHexString(obj.hashCode()) + " {\n");
+                    Set keySet = ((Map) obj).keySet();
+                    for (Object key : keySet) {
+                        String keyStr = String.valueOf(key);
+                        String valueStr = String.valueOf(((Map) obj).get(key));
+                        Log.e(">>>>>>", "    \"" + keyStr + "\": \"" + valueStr + "\",");
+                    }
+                    Log.e(">>>>>>", "}");
+                } else if (obj instanceof List) {
+                    List list = (List) obj;
+                    Log.e(">>>>>>", "List: " + obj.getClass().getName() + "@" + Integer.toHexString(obj.hashCode()) + " [\n");
+                    for (Object value : list) {
+                        Log.e(">>>>>>", "    " + value + ",");
+                    }
+                    Log.e(">>>>>>", "]");
+                } else {
+                    String msg = String.valueOf(obj);
+                    if (isNull(msg)) {
+                        return;
+                    }
+                    if (obj.toString().length() > 2048) {
+                        bigLog(msg, false);
+                    } else {
+                        LogG(msg);
+                        if (!JsonFormat.formatJson(msg)) {
+                            Log.e(">>>>>>", msg);
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+    
+    public static void bigLog(String msg, boolean error) {
+        Log.i(">>>bigLog", "BIGLOG.start=================================");
+        if (isNull(msg)) {
+            return;
+        }
+        LogG(msg);
+        int strLength = msg.length();
+        int start = 0;
+        int end = 2000;
+        for (int i = 0; i < 100; i++) {
+            //剩下的文本还是大于规定长度则继续重复截取并输出
+            if (strLength > end) {
+                if (error) {
+                    Log.e(">>>", msg.substring(start, end));
+                } else {
+                    Log.v(">>>", msg.substring(start, end));
+                }
+                start = end;
+                end = end + 2000;
+            } else {
+                if (error) {
+                    Log.e(">>>", msg.substring(start, strLength));
+                } else {
+                    Log.v(">>>", msg.substring(start, strLength));
+                }
+                break;
+            }
+        }
+        Log.i(">>>bigLog", "BIGLOG.end=================================");
+    }
+    
+    public static void LogG(String s) {
+        if (!BETA_PLAN) {
+            return;
+        }
         try {
             if (logFile == null) {
-                createWriter(context);
+                createWriter();
             }
             logWriter = new FileWriter(logFile, true);
             logWriter.write(s + "\n");
@@ -39,18 +163,37 @@ public static void LogG(Context context, String s) {
         }
     }
     
-    public static void createWriter(Context context) {
+    public static void catchException(Throwable e) {
+        if (logFile == null) {
+            createWriter();
+        }
+        Preferences.getInstance().commit(BaseApp.getPrivateInstance(), "cache", "bugReporterFile", logFile.getAbsolutePath());
+        showInfo(e);
+    }
+    
+    private static void showInfo(Throwable e) {
+        if (!DEBUGMODE) {
+            return;
+        }
+        String errorInfo = DebugLogG.getExceptionInfo(e);
+        String[] lines = errorInfo.split(LINE_SEPARATOR);
+        for (String line : lines) {
+            Log.e(">>>>>>", line);
+        }
+    }
+    
+    public static void createWriter() {
         try {
-            logFile = new File(context.getExternalCacheDir(), System.currentTimeMillis() + ".bfl");
+            logFile = new File(BaseApp.getPrivateInstance().getCacheDir(), System.currentTimeMillis() + ".bfl");
             logWriter = new FileWriter(logFile, true);
             
-            logWriter.write("App.Start===============" +
-                    "\npackageName>>>" + context.getPackageName() +
-                    "\nappVer>>>" + context.getPackageManager().getPackageInfo(context.getPackageName(), 0).versionName + "(" + context.getPackageManager().getPackageInfo(context.getPackageName(), 0).versionCode + ")" +
+            logWriter.write("BaseApp.Start===============" +
+                    "\npackageName>>>" + BaseApp.getPrivateInstance().getPackageName() +
+                    "\nappVer>>>" + BaseApp.getPrivateInstance().getPackageManager().getPackageInfo(BaseApp.getPrivateInstance().getPackageName(), 0).versionName + "(" + BaseApp.getPrivateInstance().getPackageManager().getPackageInfo(BaseApp.getPrivateInstance().getPackageName(), 0).versionCode + ")" +
                     "\nmanufacturer>>>" + android.os.Build.BRAND.toLowerCase() +
                     "\nmodel>>>" + android.os.Build.MODEL.toLowerCase() +
                     "\nos-ver>>>" + android.os.Build.VERSION.RELEASE.toLowerCase() +
-                    "\nandroidId>>>" + android.provider.Settings.System.getString(context.getContentResolver(), android.provider.Settings.System.ANDROID_ID) +
+                    "\nandroidId>>>" + android.provider.Settings.System.getString(BaseApp.getPrivateInstance().getContentResolver(), android.provider.Settings.System.ANDROID_ID) +
                     "\n\nLog.Start===============\n"
             );
             logWriter.close();
@@ -59,14 +202,6 @@ public static void createWriter(Context context) {
         }
     }
     
-    public static void catchException(Context context, Thread t, Throwable e) {
-        if (logFile == null) {
-            createWriter(context);
-        }
-        Preferences.getInstance().commit(context, "cache", "bugReporterFile", logFile.getAbsolutePath());
-        LogG(context, "\nError>>>\n" + getExceptionInfo(e));
-    }
-    
     public static String getExceptionInfo(Throwable e) {
         StringWriter sw = new StringWriter();
         PrintWriter pw = new PrintWriter(sw, true);
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/FragmentChangeUtil.java b/baseframework/src/main/java/com/kongzue/baseframework/util/FragmentChangeUtil.java
index 7b8e277..216cc0c 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/util/FragmentChangeUtil.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/util/FragmentChangeUtil.java
@@ -39,11 +39,9 @@ public FragmentChangeUtil(BaseActivity me, int frameLayoutResId) {
     }
     
     public FragmentChangeUtil build(BaseActivity me, int frameLayoutResId) {
-        if (me.getSavedInstanceState() == null) {
-            this.me = me;
-            this.frameLayoutResId = frameLayoutResId;
-            fragmentList = new ArrayList<>();
-        }
+        this.me = me;
+        this.frameLayoutResId = frameLayoutResId;
+        fragmentList = new ArrayList<>();
         return this;
     }
     
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/Preferences.java b/baseframework/src/main/java/com/kongzue/baseframework/util/Preferences.java
index 68f2be0..fc41077 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/util/Preferences.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/util/Preferences.java
@@ -12,8 +12,7 @@
 public class Preferences {
     
     private static Preferences preferences;
-    private SharedPreferences sp;
-    private ChangeSharedPreferencesPathCallBack changeSharedPreferencesPathCallBack;
+    private static ChangeSharedPreferencesPathCallBack changeSharedPreferencesPathCallBack;
     
     private Preferences() {
     }
@@ -66,50 +65,82 @@ public int getInt(Context context, String path, String preferencesName) {
     }
     
     /**
-     * 读取属性为String类型
+     * 读取属性为Int类型
      *
      * @param context         上下文索引
      * @param path            路径
      * @param preferencesName 属性名
      * @param defaultValue    默认值
-     * @return String
+     * @return Int
      */
-    public String getString(Context context, String path, String preferencesName, String defaultValue) {
-        initSharedPreferences(context, path);
-        String value = sp.getString(preferencesName, defaultValue);
+    public int getInt(Context context, String path, String preferencesName, int defaultValue) {
+        int value = initSharedPreferences(context, path).getInt(preferencesName, defaultValue);
         return value;
     }
     
     /**
-     * 读取属性为Boolean类型
+     * 读取属性为String类型
      *
      * @param context         上下文索引
      * @param path            路径
      * @param preferencesName 属性名
      * @param defaultValue    默认值
-     * @return Boolean
+     * @return String
      */
-    public boolean getBoolean(Context context, String path, String preferencesName, boolean defaultValue) {
-        initSharedPreferences(context, path);
-        boolean value = sp.getBoolean(preferencesName, defaultValue);
+    public String getString(Context context, String path, String preferencesName, String defaultValue) {
+        String value = initSharedPreferences(context, path).getString(preferencesName, defaultValue);
         return value;
     }
     
     /**
-     * 读取属性为Int类型
+     * 读取属性为Boolean类型
      *
      * @param context         上下文索引
      * @param path            路径
      * @param preferencesName 属性名
      * @param defaultValue    默认值
-     * @return Int
+     * @return Boolean
      */
-    public int getInt(Context context, String path, String preferencesName, int defaultValue) {
-        initSharedPreferences(context, path);
-        int value = sp.getInt(preferencesName, defaultValue);
+    public boolean getBoolean(Context context, String path, String preferencesName, boolean defaultValue) {
+        boolean value = initSharedPreferences(context, path).getBoolean(preferencesName, defaultValue);
+        return value;
+    }
+    
+    public float getFloat(Context context, String path, String preferencesName) {
+        return getFloat(context, path, preferencesName, 0);
+    }
+    
+    public float getFloat(Context context, String path, String preferencesName, float defaultValue) {
+        float value = initSharedPreferences(context, path).getFloat(preferencesName, defaultValue);
         return value;
     }
     
+    public long getLong(Context context, String path, String preferencesName) {
+        return getLong(context, path, preferencesName, 0);
+    }
+    
+    public long getLong(Context context, String path, String preferencesName, long defaultValue) {
+        long value = initSharedPreferences(context, path).getLong(preferencesName, defaultValue);
+        return value;
+    }
+    
+    public double getDouble(Context context, String path, String preferencesName) {
+        return getDouble(context, path, preferencesName, 0);
+    }
+    
+    public double getDouble(Context context, String path, String preferencesName, double defaultValue) {
+        String value = initSharedPreferences(context, path).getString(preferencesName, String.valueOf(defaultValue));
+        if (value != null) {
+            try {
+                return Double.parseDouble(value);
+            } catch (Exception e) {
+                return defaultValue;
+            }
+        } else {
+            return defaultValue;
+        }
+    }
+    
     /**
      * 写入String属性方法，占用资源较少，但不会立即生效
      *
@@ -120,8 +151,7 @@ public int getInt(Context context, String path, String preferencesName, int defa
      * @return none
      */
     public void set(Context context, String path, String preferencesName, String value) {
-        initSharedPreferences(context, path);
-        SharedPreferences.Editor editor = sp.edit();
+        SharedPreferences.Editor editor = initSharedPreferences(context, path).edit();
         editor.putString(preferencesName, value);
         editor.apply();
     }
@@ -136,8 +166,7 @@ public void set(Context context, String path, String preferencesName, String val
      * @return none
      */
     public void set(Context context, String path, String preferencesName, boolean value) {
-        initSharedPreferences(context, path);
-        SharedPreferences.Editor editor = sp.edit();
+        SharedPreferences.Editor editor = initSharedPreferences(context, path).edit();
         editor.putBoolean(preferencesName, value);
         editor.apply();
     }
@@ -152,12 +181,56 @@ public void set(Context context, String path, String preferencesName, boolean va
      * @return none
      */
     public void set(Context context, String path, String preferencesName, int value) {
-        initSharedPreferences(context, path);
-        SharedPreferences.Editor editor = sp.edit();
+        SharedPreferences.Editor editor = initSharedPreferences(context, path).edit();
         editor.putInt(preferencesName, value);
         editor.apply();
     }
     
+    /**
+     * 写入float属性方法，占用资源较少，但不会立即生效
+     *
+     * @param context         上下文索引
+     * @param path            路径
+     * @param preferencesName 属性名
+     * @param value           值
+     * @return none
+     */
+    public void set(Context context, String path, String preferencesName, float value) {
+        SharedPreferences.Editor editor = initSharedPreferences(context, path).edit();
+        editor.putFloat(preferencesName, value);
+        editor.apply();
+    }
+    
+    /**
+     * 写入double属性方法，占用资源较少，但不会立即生效
+     *
+     * @param context         上下文索引
+     * @param path            路径
+     * @param preferencesName 属性名
+     * @param value           值
+     * @return none
+     */
+    public void set(Context context, String path, String preferencesName, double value) {
+        SharedPreferences.Editor editor = initSharedPreferences(context, path).edit();
+        editor.putString(preferencesName, String.valueOf(value));
+        editor.apply();
+    }
+    
+    /**
+     * 写入long属性方法，占用资源较少，但不会立即生效
+     *
+     * @param context         上下文索引
+     * @param path            路径
+     * @param preferencesName 属性名
+     * @param value           值
+     * @return none
+     */
+    public void set(Context context, String path, String preferencesName, long value) {
+        SharedPreferences.Editor editor = initSharedPreferences(context, path).edit();
+        editor.putLong(preferencesName, value);
+        editor.apply();
+    }
+    
     /**
      * 写入String属性方法，立即生效
      *
@@ -168,8 +241,7 @@ public void set(Context context, String path, String preferencesName, int value)
      * @return none
      */
     public void commit(Context context, String path, String preferencesName, String value) {
-        initSharedPreferences(context, path);
-        SharedPreferences.Editor editor = sp.edit();
+        SharedPreferences.Editor editor = initSharedPreferences(context, path).edit();
         editor.putString(preferencesName, value);
         editor.commit();
     }
@@ -184,8 +256,7 @@ public void commit(Context context, String path, String preferencesName, String
      * @return none
      */
     public void commit(Context context, String path, String preferencesName, boolean value) {
-        initSharedPreferences(context, path);
-        SharedPreferences.Editor editor = sp.edit();
+        SharedPreferences.Editor editor = initSharedPreferences(context, path).edit();
         editor.putBoolean(preferencesName, value);
         editor.commit();
     }
@@ -200,12 +271,29 @@ public void commit(Context context, String path, String preferencesName, boolean
      * @return none
      */
     public void commit(Context context, String path, String preferencesName, int value) {
-        initSharedPreferences(context, path);
-        SharedPreferences.Editor editor = sp.edit();
+        SharedPreferences.Editor editor = initSharedPreferences(context, path).edit();
         editor.putInt(preferencesName, value);
         editor.commit();
     }
     
+    public void commit(Context context, String path, String preferencesName, float value) {
+        SharedPreferences.Editor editor = initSharedPreferences(context, path).edit();
+        editor.putFloat(preferencesName, value);
+        editor.commit();
+    }
+    
+    public void commit(Context context, String path, String preferencesName, double value) {
+        SharedPreferences.Editor editor = initSharedPreferences(context, path).edit();
+        editor.putString(preferencesName, String.valueOf(value));
+        editor.commit();
+    }
+    
+    public void commit(Context context, String path, String preferencesName, long value) {
+        SharedPreferences.Editor editor = initSharedPreferences(context, path).edit();
+        editor.putLong(preferencesName, value);
+        editor.commit();
+    }
+    
     /**
      * 清除（清空）所有属性的方法
      *
@@ -214,27 +302,19 @@ public void commit(Context context, String path, String preferencesName, int val
      * @return none
      */
     public void cleanAll(Context context, String path) {
-        initSharedPreferences(context, path);
+        SharedPreferences sp = initSharedPreferences(context, path);
         if (sp != null) {
             sp.edit().clear().apply();
         }
     }
     
-    private void initSharedPreferences(Context context, String path) {
-        if (sp == null) {
-            sp = context.getApplicationContext().getSharedPreferences(path, Context.MODE_PRIVATE);
+    private SharedPreferences initSharedPreferences(Context context, String path) {
+        SharedPreferences sp;
+        if (changeSharedPreferencesPathCallBack != null) {
+            sp = changeSharedPreferencesPathCallBack.onPathChange(path);
         } else {
-            if (changeSharedPreferencesPathCallBack!=null) {
-                sp = changeSharedPreferencesPathCallBack.onPathChange(path);
-            }
+            sp = context.getApplicationContext().getSharedPreferences(path, Context.MODE_PRIVATE);
         }
-    }
-    
-    /**
-     * 获取 SharedPreferences 实例
-     * @return SharedPreferences实例对象
-     */
-    public SharedPreferences getSharedPreferences() {
         return sp;
     }
     
@@ -243,51 +323,18 @@ public SharedPreferences getSharedPreferences() {
      * 请返回已切换至指定 Path 后的 SharedPreferences 对象。
      * 一般可使用以下代码：
      * return Preferences.getInstance().getSharedPreferences().getSharedPreferences(path, Context.MODE_PRIVATE);
-     *
+     * <p>
      * 完成切换操作，实际可能需要根据 SharedPreferences 实例的实际情况决定。
-     *
      */
     public interface ChangeSharedPreferencesPathCallBack {
         SharedPreferences onPathChange(String path);
     }
     
-    /**
-     * 此方法已废弃，原因是原方法需要单独指定 ChangeSharedPreferencesPathCallBack。
-     * ChangeSharedPreferencesPathCallBack 是用于切换 SharedPreferences 路径的回调函数，
-     * 如果要自定义 SharedPreferences 实例，一定要指定 ChangeSharedPreferencesPathCallBack 切换方法，
-     * 否则可能导致无法切换至指定 Path
-     *
-     * @param sp    自定义 SharedPreferences 实例
-     * @return      继续执行其他方法
-     */
-    @Deprecated
-    public Preferences initSharedPreferences(SharedPreferences sp) {
-        this.sp = sp;
-        return this;
-    }
-    
-    /**
-     * 初始化自定义 SharedPreferences 实例，要执行此方法请务必于开始任何读写操作前进行。
-     * ChangeSharedPreferencesPathCallBack 是用于切换 SharedPreferences 路径的回调函数，
-     * 如果要自定义 SharedPreferences 实例，一定要指定 ChangeSharedPreferencesPathCallBack 切换方法，
-     * 否则可能导致无法切换至指定 Path
-     *
-     * @param sp                                        自定义 SharedPreferences 实例
-     * @param changeSharedPreferencesPathCallBack       ChangeSharedPreferencesPathCallBack 回调
-     * @return                                          继续执行其他方法
-     */
-    public Preferences initSharedPreferences(SharedPreferences sp, ChangeSharedPreferencesPathCallBack changeSharedPreferencesPathCallBack) {
-        this.sp = sp;
-        this.changeSharedPreferencesPathCallBack = changeSharedPreferencesPathCallBack;
-        return this;
-    }
-    
-    public ChangeSharedPreferencesPathCallBack getChangeSharedPreferencesPathCallBack() {
+    public static ChangeSharedPreferencesPathCallBack getChangeSharedPreferencesPathCallBack() {
         return changeSharedPreferencesPathCallBack;
     }
     
-    public Preferences setChangeSharedPreferencesPathCallBack(ChangeSharedPreferencesPathCallBack changeSharedPreferencesPathCallBack) {
-        this.changeSharedPreferencesPathCallBack = changeSharedPreferencesPathCallBack;
-        return this;
+    public static void setChangeSharedPreferencesPathCallBack(ChangeSharedPreferencesPathCallBack l) {
+        changeSharedPreferencesPathCallBack = l;
     }
 }
\ No newline at end of file

From 9445b90dca7d487e6ef0c617caa74171a34497bb Mon Sep 17 00:00:00 2001
From: kongzue <myzcxhh@live.cn>
Date: Thu, 23 Jul 2020 17:35:01 +0800
Subject: [PATCH 10/18] 6.7.5 pub

---
 .idea/caches/build_file_checksums.ser         | Bin 592 -> 592 bytes
 .idea/jarRepositories.xml                     |  15 +
 app/build.gradle                              |  10 +-
 app/src/main/AndroidManifest.xml              |  28 +-
 .../com/kongzue/baseframeworkdemo/App.java    |  69 ++--
 .../activity/DemoActivity.java                |  80 +++++
 .../activity/JumpActivity.java                |  49 +++
 .../activity/ResponseActivity.java            |  56 +++
 .../activity/TransitionActivity.java          |  37 ++
 .../fragment/AboutFragment.java               |  81 +++++
 .../fragment/FunctionFragment.java            | 322 ++++++++++++++++++
 .../fragment/IntroductionFragment.java        |  78 +++++
 .../util/AutoHeightListView.java              |  32 ++
 .../main/res/layout/activity_adapter_test.xml |   8 +-
 app/src/main/res/layout/activity_demo.xml     |  50 +++
 app/src/main/res/layout/activity_jump.xml     |  23 +-
 app/src/main/res/layout/activity_response.xml |  22 +-
 .../main/res/layout/activity_transition.xml   |   3 +-
 app/src/main/res/layout/fragment_about.xml    |  11 +
 app/src/main/res/layout/fragment_function.xml | 139 ++++++++
 .../main/res/layout/fragment_introduction.xml | 107 ++++++
 app/src/main/res/mipmap-xhdpi/img_back.png    | Bin 0 -> 1014 bytes
 .../mipmap-xxhdpi/img_maintab_function.png    | Bin 0 -> 6005 bytes
 .../main/res/mipmap-xxhdpi/img_maintab_me.png | Bin 0 -> 5337 bytes
 .../mipmap-xxhdpi/img_tab_introduction.png    | Bin 0 -> 3552 bytes
 app/src/main/res/values-en/strings.xml        |  10 +-
 app/src/main/res/values/strings.xml           |  27 +-
 .../baseframework/util/AppManager.java        |   3 +
 28 files changed, 1200 insertions(+), 60 deletions(-)
 create mode 100644 app/src/main/java/com/kongzue/baseframeworkdemo/activity/DemoActivity.java
 create mode 100644 app/src/main/java/com/kongzue/baseframeworkdemo/activity/JumpActivity.java
 create mode 100644 app/src/main/java/com/kongzue/baseframeworkdemo/activity/ResponseActivity.java
 create mode 100644 app/src/main/java/com/kongzue/baseframeworkdemo/activity/TransitionActivity.java
 create mode 100644 app/src/main/java/com/kongzue/baseframeworkdemo/fragment/AboutFragment.java
 create mode 100644 app/src/main/java/com/kongzue/baseframeworkdemo/fragment/FunctionFragment.java
 create mode 100644 app/src/main/java/com/kongzue/baseframeworkdemo/fragment/IntroductionFragment.java
 create mode 100644 app/src/main/java/com/kongzue/baseframeworkdemo/util/AutoHeightListView.java
 create mode 100644 app/src/main/res/layout/activity_demo.xml
 create mode 100644 app/src/main/res/layout/fragment_about.xml
 create mode 100644 app/src/main/res/layout/fragment_function.xml
 create mode 100644 app/src/main/res/layout/fragment_introduction.xml
 create mode 100644 app/src/main/res/mipmap-xhdpi/img_back.png
 create mode 100644 app/src/main/res/mipmap-xxhdpi/img_maintab_function.png
 create mode 100644 app/src/main/res/mipmap-xxhdpi/img_maintab_me.png
 create mode 100644 app/src/main/res/mipmap-xxhdpi/img_tab_introduction.png

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 06ccf3e7e930620b4318472ead3b2df90e794f91..834da8034684e7b74fbe50177e3b48b3c32be295 100644
GIT binary patch
delta 36
scmcb>a)D*S43=t!V;3jRDHo_~^7;{G&6C-w5taK}aog?9%8a^<03?AA4FCWD

delta 36
scmcb>a)D*S43?@DF?AE?lnV%()ZaVJ@?(Rju}jy?63gJt%8a^<03XT@Q~&?~

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index a5f05cd..23a8e76 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -21,5 +21,20 @@
       <option name="name" value="Google" />
       <option name="url" value="https://dl.google.com/dl/android/maven2/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="D:\sdk\Android\extras\android\m2repository" />
+      <option name="name" value="D:\sdk\Android\extras\android\m2repository" />
+      <option name="url" value="file:/D:/SDK/Android/extras/android/m2repository/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="D:\sdk\Android\extras\google\m2repository" />
+      <option name="name" value="D:\sdk\Android\extras\google\m2repository" />
+      <option name="url" value="file:/D:/SDK/Android/extras/google/m2repository/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="D:\sdk\Android\extras\m2repository" />
+      <option name="name" value="D:\sdk\Android\extras\m2repository" />
+      <option name="url" value="file:/D:/SDK/Android/extras/m2repository/" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index ad4815c..7fa5451 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
     defaultConfig {
         applicationId "com.kongzue.baseframeworkdemo"
         minSdkVersion 15
-        targetSdkVersion 28
-        versionCode 97
-        versionName "6.6.5.2"
+        targetSdkVersion 29
+        versionCode 110
+        versionName "6.7.5"
     }
     buildTypes {
         release {
@@ -20,5 +20,7 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'com.kongzue.tabbar:tabbar:1.5.4'
     implementation project(':baseframework')
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4737515..532ae1d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,19 +2,21 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.kongzue.baseframeworkdemo">
 
+    <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
 
     <application
+        android:name=".App"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:name=".App"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity"
+        <activity
+            android:name=".activity.DemoActivity"
             android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -22,14 +24,18 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".JumpActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"/>
-        <activity android:name=".ResponseActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"/>
-        <activity android:name=".AdapterTestActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"/>
-        <activity android:name=".TransitionActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"></activity>
+        <activity
+            android:name=".activity.JumpActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize" />
+        <activity
+            android:name=".activity.ResponseActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize" />
+        <activity
+            android:name=".activity.AdapterTestActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize" />
+        <activity
+            android:name=".activity.TransitionActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/kongzue/baseframeworkdemo/App.java b/app/src/main/java/com/kongzue/baseframeworkdemo/App.java
index e5fec5a..a1acb38 100644
--- a/app/src/main/java/com/kongzue/baseframeworkdemo/App.java
+++ b/app/src/main/java/com/kongzue/baseframeworkdemo/App.java
@@ -1,11 +1,14 @@
 package com.kongzue.baseframeworkdemo;
 
-import android.app.Application;
-import android.util.Log;
+import android.content.DialogInterface;
+import android.widget.Toast;
 
-import com.kongzue.baseframework.BaseActivity;
+import androidx.appcompat.app.AlertDialog;
+
+import com.kongzue.baseframework.BaseApp;
 import com.kongzue.baseframework.BaseFrameworkSettings;
 import com.kongzue.baseframework.interfaces.OnBugReportListener;
+import com.kongzue.baseframework.interfaces.OnSDKInitializedCallBack;
 import com.kongzue.baseframework.util.AppManager;
 
 import java.io.File;
@@ -17,31 +20,55 @@
  * Mail: myzcxhh@live.cn
  * CreateTime: 2018/9/30 04:12
  */
-public class App extends Application {
+public class App extends BaseApp<App> {
     
     @Override
-    public void onCreate() {
-        super.onCreate();
-        
-        BaseFrameworkSettings.DEBUGMODE = true;
-        BaseFrameworkSettings.BETA_PLAN = true;
-    
-        AppManager.setOnActivityStatusChangeListener(new AppManager.OnActivityStatusChangeListener() {
+    public void init() {
+        setOnSDKInitializedCallBack(new OnSDKInitializedCallBack() {
             @Override
-            public void onActivityCreate(BaseActivity activity) {
-            
+            public void onInitialized() {
+                log("onInitialized: ");
+                Toast.makeText(me, "SDK已加载完毕", Toast.LENGTH_LONG).show();
             }
-    
-            @Override
-            public void onActivityDestroy(BaseActivity activity) {
+        });
         
-            }
-    
+        setOnCrashListener(new OnBugReportListener() {
             @Override
-            public void onAllActivityClose() {
-                Log.e(">>>", "onAllActivityClose ");
+            public boolean onCrash(Exception e, final File crashLogFile) {
+                if (AppManager.getInstance().getActiveActivity() == null || !AppManager.getInstance().getActiveActivity().isActive) {
+                    return false;
+                }
+                AlertDialog.Builder builder = new AlertDialog.Builder(AppManager.getInstance().getActiveActivity());
+                builder.setTitle("Ops！发生了一次崩溃！");
+                builder.setMessage("您是否愿意帮助我们改进程序以修复此Bug？");
+                builder.setPositiveButton("愿意", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        toast("请对file进行处理：" + crashLogFile.getAbsolutePath());
+                    }
+                });
+                builder.setNegativeButton("不了", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                    
+                    }
+                });
+                builder.setCancelable(false);
+                AlertDialog dialog = builder.create();
+                dialog.show();
+                
+                return false;
             }
         });
-        
+    }
+    
+    @Override
+    public void initSDKs() {
+        BaseFrameworkSettings.DEBUGMODE = true;
+        BaseFrameworkSettings.BETA_PLAN = true;
+        try {
+            Thread.sleep(8000);
+        } catch (Exception e) {
+        }
     }
 }
diff --git a/app/src/main/java/com/kongzue/baseframeworkdemo/activity/DemoActivity.java b/app/src/main/java/com/kongzue/baseframeworkdemo/activity/DemoActivity.java
new file mode 100644
index 0000000..8f606a6
--- /dev/null
+++ b/app/src/main/java/com/kongzue/baseframeworkdemo/activity/DemoActivity.java
@@ -0,0 +1,80 @@
+package com.kongzue.baseframeworkdemo.activity;
+
+import android.view.View;
+
+import com.kongzue.baseframework.BaseActivity;
+import com.kongzue.baseframework.BaseFragment;
+import com.kongzue.baseframework.interfaces.BindView;
+import com.kongzue.baseframework.interfaces.DarkNavigationBarTheme;
+import com.kongzue.baseframework.interfaces.DarkStatusBarTheme;
+import com.kongzue.baseframework.interfaces.FragmentLayout;
+import com.kongzue.baseframework.interfaces.Layout;
+import com.kongzue.baseframework.interfaces.NavigationBarBackgroundColor;
+import com.kongzue.baseframework.interfaces.OnFragmentChangeListener;
+import com.kongzue.baseframework.util.FragmentChangeUtil;
+import com.kongzue.baseframework.util.JumpParameter;
+import com.kongzue.baseframeworkdemo.R;
+import com.kongzue.baseframeworkdemo.fragment.AboutFragment;
+import com.kongzue.baseframeworkdemo.fragment.FunctionFragment;
+import com.kongzue.baseframeworkdemo.fragment.IntroductionFragment;
+import com.kongzue.tabbar.Tab;
+import com.kongzue.tabbar.TabBarView;
+import com.kongzue.tabbar.interfaces.OnTabChangeListener;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Layout(R.layout.activity_demo)
+@DarkStatusBarTheme(false)
+@NavigationBarBackgroundColor(a = 255, r = 255, g = 255, b = 255)
+@DarkNavigationBarTheme(true)
+@FragmentLayout(R.id.frame)
+public class DemoActivity extends BaseActivity {
+    
+    private IntroductionFragment introductionFragment = new IntroductionFragment();
+    private FunctionFragment functionFragment = new FunctionFragment();
+    private AboutFragment aboutFragment = new AboutFragment();
+    
+    @BindView(R.id.tabbar)
+    private TabBarView tabbar;
+    
+    @Override
+    public void initViews() {
+        tabbar = findViewById(R.id.tabbar);
+    }
+    
+    @Override
+    public void initDatas(JumpParameter parameter) {
+        List<Tab> tabs = new ArrayList<>();
+        tabs.add(new Tab(this, getString(R.string.introduction), R.mipmap.img_tab_introduction));
+        tabs.add(new Tab(this, getString(R.string.function), R.mipmap.img_maintab_function));
+        tabs.add(new Tab(this, getString(R.string.github), R.mipmap.img_maintab_me));
+        tabbar.setTab(tabs);
+    }
+    
+    @Override
+    public void initFragment(FragmentChangeUtil fragmentChangeUtil) {
+        fragmentChangeUtil.addFragment(introductionFragment);
+        fragmentChangeUtil.addFragment(functionFragment);
+        fragmentChangeUtil.addFragment(aboutFragment);
+        
+        changeFragment(0);
+    }
+    
+    @Override
+    public void setEvents() {
+        tabbar.setOnTabChangeListener(new OnTabChangeListener() {
+            @Override
+            public void onTabChanged(View v, int index) {
+                changeFragment(index);
+            }
+        });
+        
+        getFragmentChangeUtil().setOnFragmentChangeListener(new OnFragmentChangeListener() {
+            @Override
+            public void onChange(int index, BaseFragment fragment) {
+                tabbar.setNormalFocusIndex(index);
+            }
+        });
+    }
+}
diff --git a/app/src/main/java/com/kongzue/baseframeworkdemo/activity/JumpActivity.java b/app/src/main/java/com/kongzue/baseframeworkdemo/activity/JumpActivity.java
new file mode 100644
index 0000000..abc0fa1
--- /dev/null
+++ b/app/src/main/java/com/kongzue/baseframeworkdemo/activity/JumpActivity.java
@@ -0,0 +1,49 @@
+package com.kongzue.baseframeworkdemo.activity;
+
+import android.graphics.Bitmap;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.kongzue.baseframework.BaseActivity;
+import com.kongzue.baseframework.interfaces.Layout;
+import com.kongzue.baseframework.interfaces.SwipeBack;
+import com.kongzue.baseframework.util.JumpParameter;
+import com.kongzue.baseframeworkdemo.R;
+
+@Layout(R.layout.activity_jump)
+@SwipeBack(true)
+public class JumpActivity extends BaseActivity {
+
+    private TextView txtP1;
+    private ImageView imgP2;
+    private Button btnClose;
+
+    @Override
+    public void initViews() {
+        txtP1 = findViewById(R.id.txt_p1);
+        imgP2 = findViewById(R.id.img_p2);
+        btnClose = findViewById(R.id.btn_close);
+    }
+
+    @Override
+    public void initDatas(JumpParameter parameter) {
+        String parameter1 = (String) getParameter().get("参数1");
+        if (!isNull(parameter1)) txtP1.setText("第一个参数读取到的值为：\n" + parameter1);
+
+        Bitmap parameter2 = (Bitmap) getParameter().get("参数2");
+        if (parameter2 != null) imgP2.setImageBitmap(parameter2);
+    }
+
+    @Override
+    public void setEvents() {
+        btnClose.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+    }
+
+}
diff --git a/app/src/main/java/com/kongzue/baseframeworkdemo/activity/ResponseActivity.java b/app/src/main/java/com/kongzue/baseframeworkdemo/activity/ResponseActivity.java
new file mode 100644
index 0000000..73a03f2
--- /dev/null
+++ b/app/src/main/java/com/kongzue/baseframeworkdemo/activity/ResponseActivity.java
@@ -0,0 +1,56 @@
+package com.kongzue.baseframeworkdemo.activity;
+
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.kongzue.baseframework.BaseActivity;
+import com.kongzue.baseframework.interfaces.Layout;
+import com.kongzue.baseframework.interfaces.SwipeBack;
+import com.kongzue.baseframework.util.JumpParameter;
+import com.kongzue.baseframeworkdemo.R;
+
+@Layout(R.layout.activity_response)
+@SwipeBack(true)
+public class ResponseActivity extends BaseActivity {
+
+    private TextView txtTitle;
+    private TextView txtP1;
+    private Button btnSet;
+    private Button btnClose;
+
+    @Override
+    public void initViews() {
+        txtTitle = findViewById(R.id.txt_title);
+        txtP1 = findViewById(R.id.txt_p1);
+        btnSet = findViewById(R.id.btn_set);
+        btnClose = findViewById(R.id.btn_close);
+    }
+
+    @Override
+    public void initDatas(JumpParameter parameter) {
+
+    }
+
+    @Override
+    public void setEvents() {
+        btnSet.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if ((boolean) getParameter().get("needResponse") == true) {
+                    setResponse(new JumpParameter().put("返回数据1", "测试成功"));
+                    btnSet.setText("已设置返回数据：key=返回数据1  value=测试成功");
+                } else {
+                    toast("needResponse = false：不需要返回数据给上一个界面");
+                }
+            }
+        });
+
+        btnClose.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+    }
+}
diff --git a/app/src/main/java/com/kongzue/baseframeworkdemo/activity/TransitionActivity.java b/app/src/main/java/com/kongzue/baseframeworkdemo/activity/TransitionActivity.java
new file mode 100644
index 0000000..a0dac7c
--- /dev/null
+++ b/app/src/main/java/com/kongzue/baseframeworkdemo/activity/TransitionActivity.java
@@ -0,0 +1,37 @@
+package com.kongzue.baseframeworkdemo.activity;
+
+import android.view.View;
+import android.widget.Button;
+
+import com.kongzue.baseframework.BaseActivity;
+import com.kongzue.baseframework.interfaces.Layout;
+import com.kongzue.baseframework.interfaces.SwipeBack;
+import com.kongzue.baseframework.util.JumpParameter;
+import com.kongzue.baseframeworkdemo.R;
+
+@Layout(R.layout.activity_transition)
+@SwipeBack(true)
+public class TransitionActivity extends BaseActivity {
+    
+    private Button btnTransition;
+    
+    @Override
+    public void initViews() {
+        btnTransition = findViewById(R.id.btn_transition);
+    }
+    
+    @Override
+    public void initDatas(JumpParameter paramer) {
+    
+    }
+    
+    @Override
+    public void setEvents() {
+        btnTransition.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                onBackPressed();
+            }
+        });
+    }
+}
diff --git a/app/src/main/java/com/kongzue/baseframeworkdemo/fragment/AboutFragment.java b/app/src/main/java/com/kongzue/baseframeworkdemo/fragment/AboutFragment.java
new file mode 100644
index 0000000..bfe4497
--- /dev/null
+++ b/app/src/main/java/com/kongzue/baseframeworkdemo/fragment/AboutFragment.java
@@ -0,0 +1,81 @@
+package com.kongzue.baseframeworkdemo.fragment;
+
+import android.content.ActivityNotFoundException;
+import android.content.Intent;
+import android.net.Uri;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+
+import com.kongzue.baseframework.BaseFragment;
+import com.kongzue.baseframework.interfaces.Layout;
+import com.kongzue.baseframeworkdemo.activity.DemoActivity;
+import com.kongzue.baseframeworkdemo.R;
+
+/**
+ * @author: Kongzue
+ * @github: https://github.com/kongzue/
+ * @homepage: http://kongzue.com/
+ * @mail: myzcxhh@live.cn
+ * @createTime: 2019/8/20 22:18
+ */
+@Layout(R.layout.fragment_about)
+public class AboutFragment extends BaseFragment<DemoActivity> {
+    
+    private WebView webView;
+    
+    @Override
+    public void initViews() {
+        webView = findViewById(R.id.webView);
+    }
+    
+    @Override
+    public void initDatas() {
+        WebSettings webSettings = webView.getSettings();
+        webSettings.setJavaScriptEnabled(true);
+        webSettings.setLoadWithOverviewMode(true);
+        webSettings.setUseWideViewPort(true);
+        webSettings.setSupportZoom(false);
+        webSettings.setAllowFileAccess(true);
+        webSettings.setJavaScriptCanOpenWindowsAutomatically(true);
+        webSettings.setLoadsImagesAutomatically(true);
+        webSettings.setDefaultTextEncodingName("utf-8");
+    
+        webView.setWebViewClient(new WebViewClient() {
+            @Override
+            public boolean shouldOverrideUrlLoading(WebView view, String url) {
+                try {
+                    Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+                    startActivity(intent);
+                } catch (ActivityNotFoundException e) {
+                    e.printStackTrace();
+                }
+                return true;
+            }
+        
+            @Override
+            public void onPageFinished(WebView view, String url) {
+                super.onPageFinished(view, url);
+            }
+        });
+        
+        webView.loadUrl("https://github.com/kongzue/BaseFramework/");
+    }
+    
+    @Override
+    public void setEvents() {
+    
+    }
+    
+    @Override
+    public void onShow(boolean isSwitchFragment) {
+        log("AboutFragment: onShow");
+        super.onShow(isSwitchFragment);
+    }
+    
+    @Override
+    public void onHide() {
+        log("AboutFragment: onHide");
+        super.onHide();
+    }
+}
diff --git a/app/src/main/java/com/kongzue/baseframeworkdemo/fragment/FunctionFragment.java b/app/src/main/java/com/kongzue/baseframeworkdemo/fragment/FunctionFragment.java
new file mode 100644
index 0000000..8ffcddf
--- /dev/null
+++ b/app/src/main/java/com/kongzue/baseframeworkdemo/fragment/FunctionFragment.java
@@ -0,0 +1,322 @@
+package com.kongzue.baseframeworkdemo.fragment;
+
+import android.Manifest;
+import android.content.DialogInterface;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+
+import androidx.appcompat.app.AlertDialog;
+
+import com.kongzue.baseframework.BaseFragment;
+import com.kongzue.baseframework.BaseFrameworkSettings;
+import com.kongzue.baseframework.interfaces.Layout;
+import com.kongzue.baseframework.interfaces.OnClick;
+import com.kongzue.baseframework.util.JumpParameter;
+import com.kongzue.baseframework.util.OnJumpResponseListener;
+import com.kongzue.baseframework.util.OnPermissionResponseListener;
+import com.kongzue.baseframeworkdemo.AdapterTestActivity;
+import com.kongzue.baseframeworkdemo.activity.DemoActivity;
+import com.kongzue.baseframeworkdemo.activity.JumpActivity;
+import com.kongzue.baseframeworkdemo.R;
+import com.kongzue.baseframeworkdemo.activity.ResponseActivity;
+import com.kongzue.baseframeworkdemo.activity.TransitionActivity;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * @author: Kongzue
+ * @github: https://github.com/kongzue/
+ * @homepage: http://kongzue.com/
+ * @mail: myzcxhh@live.cn
+ * @createTime: 2019/8/20 21:57
+ */
+@Layout(R.layout.fragment_function)
+public class FunctionFragment extends BaseFragment<DemoActivity> {
+    
+    private TextView textView;
+    private Button intentToBaseAdapter;
+    private Button btnJump;
+    private Button btnResult;
+    private Button btnTransition;
+    private Button btnPermission;
+    private Button btnError;
+    private Button btnPrintJsonLog;
+    private Button btnPrintMapLog;
+    private Button btnPrintListLog;
+    private Button btnGetImei;
+    private Button btnChangeLng;
+    private Button btnToast;
+    private Button btnTimer;
+    
+    @Override
+    public void initViews() {
+        textView = findViewById(R.id.textView);
+        intentToBaseAdapter = findViewById(R.id.intentToBaseAdapter);
+        btnJump = findViewById(R.id.btn_jump);
+        btnResult = findViewById(R.id.btn_result);
+        btnTransition = findViewById(R.id.btn_transition);
+        btnPermission = findViewById(R.id.btn_permission);
+        btnError = findViewById(R.id.btn_error);
+        btnPrintJsonLog = findViewById(R.id.btn_printJsonLog);
+        btnPrintMapLog = findViewById(R.id.btn_printMapLog);
+        btnPrintListLog = findViewById(R.id.btn_printListLog);
+        btnGetImei = findViewById(R.id.btn_getImei);
+        btnChangeLng = findViewById(R.id.btn_changeLng);
+        btnToast = findViewById(R.id.btn_toast);
+        btnTimer = findViewById(R.id.btn_timer);
+    }
+    
+    @Override
+    public void initDatas() {
+    
+    }
+    
+    private int time;
+    
+    //此处为组件绑定事件
+    @Override
+    public void setEvents() {
+        btnTimer.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                setFragmentResponse(new JumpParameter().put("function", ((Button) v).getText().toString()));
+    
+                runOnMainCycle(new Runnable() {
+                    @Override
+                    public void run() {
+                        time++;
+                        btnTimer.setText("t:" + time);
+                    }
+                }, 1000, 1000);
+            }
+        });
+        
+        btnToast.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                setFragmentResponse(new JumpParameter().put("function", ((Button) v).getText().toString()));
+    
+                toastS("test!");
+            }
+        });
+        
+        btnChangeLng.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                setFragmentResponse(new JumpParameter().put("function", ((Button) v).getText().toString()));
+    
+                if (BaseFrameworkSettings.selectLocale == Locale.ENGLISH) {
+                    BaseFrameworkSettings.selectLocale = Locale.CHINA;
+                } else {
+                    BaseFrameworkSettings.selectLocale = Locale.ENGLISH;
+                }
+                me.restartMe();
+            }
+        });
+        
+        btnGetImei.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                toast(getIMEI());
+            }
+        });
+        
+        btnPrintMapLog.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                setFragmentResponse(new JumpParameter().put("function", ((Button) v).getText().toString()));
+                
+                Map<String,Object> map = new HashMap<>();
+                map.put("name","kongzue");
+                map.put("email","myzcxhh@live.cn");
+                map.put("website","kongzue.com");
+                map.put("times",20);
+                map.put("signed",true);
+                log(map);
+    
+                AlertDialog.Builder builder = new AlertDialog.Builder(me);
+                builder.setTitle("提示");
+                builder.setMessage("此功能需要连接Android Studio的Logcat查看输出结果");
+                builder.setPositiveButton("知道了", null);
+                AlertDialog dialog = builder.create();
+                dialog.show();
+            }
+        });
+        
+        btnPrintListLog.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                setFragmentResponse(new JumpParameter().put("function", ((Button) v).getText().toString()));
+    
+                List list = new ArrayList();
+                list.add("listItem 1");
+                list.add("listItem 2");
+                list.add(true);
+                list.add(25.6);
+                
+                log(list);
+    
+                AlertDialog.Builder builder = new AlertDialog.Builder(me);
+                builder.setTitle("提示");
+                builder.setMessage("此功能需要连接Android Studio的Logcat查看输出结果");
+                builder.setPositiveButton("知道了", null);
+                AlertDialog dialog = builder.create();
+                dialog.show();
+            }
+        });
+        
+        btnPrintJsonLog.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                setFragmentResponse(new JumpParameter().put("function", ((Button) v).getText().toString()));
+    
+                log("{\"employees\": [{ \"firstName\":\"Bill\" , \"lastName\":\"Gates\" },{ \"firstName\":\"George\" , \"lastName\":\"Bush\" },{ \"firstName\":\"Thomas\" , \"lastName\":\"Carter\" }]}");
+                
+                AlertDialog.Builder builder = new AlertDialog.Builder(me);
+                builder.setTitle("提示");
+                builder.setMessage("此功能需要连接Android Studio的Logcat查看输出结果");
+                builder.setPositiveButton("知道了", null);
+                AlertDialog dialog = builder.create();
+                dialog.show();
+            }
+        });
+        
+        btnError.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                setFragmentResponse(new JumpParameter().put("function", ((Button) v).getText().toString()));
+    
+                doTestError();
+            }
+        });
+        
+        btnTransition.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                setFragmentResponse(new JumpParameter().put("function", ((Button) v).getText().toString()));
+    
+                jump(TransitionActivity.class, btnTransition);
+            }
+        });
+        
+        intentToBaseAdapter.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                setFragmentResponse(new JumpParameter().put("function", ((Button) v).getText().toString()));
+    
+                jump(AdapterTestActivity.class);
+            }
+        });
+        
+        btnPermission.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                setFragmentResponse(new JumpParameter().put("function", ((Button) v).getText().toString()));
+    
+                requestPermission(new String[]{Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION}, new OnPermissionResponseListener() {
+                    @Override
+                    public void onSuccess(String[] permissions) {
+                        toast("申请权限成功");
+                    }
+                    
+                    @Override
+                    public void onFail() {
+                        toast("申请权限失败");
+                    }
+                });
+            }
+        });
+        
+        btnResult.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                setFragmentResponse(new JumpParameter().put("function", ((Button) v).getText().toString()));
+    
+                AlertDialog.Builder builder = new AlertDialog.Builder(me);
+                builder.setTitle("提示");
+                builder.setMessage("跳转到下一个界面后，点击“SET返回数据”按钮即可设定返回数据，当返回此界面时会显示该数据");
+                builder.setPositiveButton("知道了", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        jump(ResponseActivity.class, new OnJumpResponseListener() {
+                            @Override
+                            public void OnResponse(JumpParameter jumpParameter) {
+                                if (jumpParameter == null) {
+                                    toast("未返回任何数据");
+                                } else {
+                                    toast("收到返回数据，参数“返回数据1”中的值为：" + jumpParameter.get("返回数据1"));
+                                }
+                            }
+                        });
+                        
+                        //亦可选用同时带参数+返回值的跳转
+                        //jump(ResponseActivity.class,new JumpParameter()
+                        //                .put("参数1", "这是一段文字参数")
+                        //                .put("参数2", "这是一段文字参数")
+                        //        , new OnResponseListener() {
+                        //    @Override
+                        //    public void OnResponse(JumpParameter parameter) {
+                        //        if (parameter==null){
+                        //            toast("未返回任何数据");
+                        //        }else{
+                        //            toast("收到返回数据，参数“返回数据1”中的值为：" + parameter.get("返回数据1"));
+                        //        }
+                        //    }
+                        //});
+                    }
+                });
+                AlertDialog dialog = builder.create();
+                dialog.show();
+            }
+        });
+    }
+    
+    @OnClick(R.id.btn_jump)
+    public void jumpFunction() {
+        setFragmentResponse(new JumpParameter().put("function", btnJump.getText().toString()));
+        AlertDialog.Builder builder = new AlertDialog.Builder(me);
+        builder.setTitle("提示");
+        builder.setMessage("接下来会创建一个Bitmap，并通过BaseActivity的通道传输给下一个BaseActivity，在其中会通过相应的方法接收到这个Bitmap。\n通过BaseActivity自带的jump(...)方法可以传输任何类型的参数给下一个界面。");
+        builder.setPositiveButton("知道了", new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                Bitmap bmp = BitmapFactory.decodeResource(getResources(), R.mipmap.img_bkg);
+                jump(JumpActivity.class, new JumpParameter()
+                        .put("参数1", "这是一段文字参数")
+                        .put("参数2", bmp)
+                );
+            }
+        });
+        AlertDialog dialog = builder.create();
+        dialog.show();
+    }
+    
+    private void doTestError() throws NullPointerException {
+        throw new NullPointerException("This is a exception for test");
+    }
+    
+    @Override
+    public void onParameterReceived(JumpParameter parameter) {
+        toast(parameter.getString("tip"));
+    }
+    
+    
+    @Override
+    public void onShow(boolean isSwitchFragment) {
+        log("FunctionFragment: onShow");
+        super.onShow(isSwitchFragment);
+    }
+    
+    @Override
+    public void onHide() {
+        log("FunctionFragment: onHide");
+        super.onHide();
+    }
+}
diff --git a/app/src/main/java/com/kongzue/baseframeworkdemo/fragment/IntroductionFragment.java b/app/src/main/java/com/kongzue/baseframeworkdemo/fragment/IntroductionFragment.java
new file mode 100644
index 0000000..db358db
--- /dev/null
+++ b/app/src/main/java/com/kongzue/baseframeworkdemo/fragment/IntroductionFragment.java
@@ -0,0 +1,78 @@
+package com.kongzue.baseframeworkdemo.fragment;
+
+import android.content.Intent;
+import android.graphics.Paint;
+import android.net.Uri;
+import android.view.View;
+import android.widget.TextView;
+
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.kongzue.baseframework.BaseApp;
+import com.kongzue.baseframework.BaseFragment;
+import com.kongzue.baseframework.interfaces.Layout;
+import com.kongzue.baseframework.interfaces.OnClick;
+import com.kongzue.baseframework.util.JumpParameter;
+import com.kongzue.baseframework.util.OnJumpResponseListener;
+import com.kongzue.baseframework.util.Preferences;
+import com.kongzue.baseframeworkdemo.App;
+import com.kongzue.baseframeworkdemo.activity.DemoActivity;
+import com.kongzue.baseframeworkdemo.R;
+
+/**
+ * @author: Kongzue
+ * @github: https://github.com/kongzue/
+ * @homepage: http://kongzue.com/
+ * @mail: myzcxhh@live.cn
+ * @createTime: 2019/8/20 21:41
+ */
+@Layout(R.layout.fragment_introduction)
+public class IntroductionFragment extends BaseFragment<DemoActivity> {
+    
+    private TextView linkHome;
+    private FloatingActionButton btnFab;
+    
+    @Override
+    public void initViews() {
+        linkHome = findViewById(R.id.link_home);
+        btnFab = findViewById(R.id.btn_fab);
+    }
+    
+    @Override
+    public void initDatas() {
+        linkHome.getPaint().setFlags(Paint.UNDERLINE_TEXT_FLAG);
+    }
+    
+    @Override
+    public void setEvents() {
+        linkHome.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Uri uri = Uri.parse("https://github.com/kongzue/BaseFramework");
+                Intent intent = new Intent(Intent.ACTION_VIEW, uri);
+                startActivity(intent);
+            }
+        });
+    }
+    
+    @OnClick(R.id.btn_fab)
+    public void startTest() {
+        jump(1, new JumpParameter().put("tip", "开始尝试功能！"), new OnJumpResponseListener() {
+            @Override
+            public void OnResponse(JumpParameter jumpParameter) {
+                toast("你刚刚使用了：" + jumpParameter.getString("function"));
+            }
+        });
+    }
+    
+    @Override
+    public void onShow(boolean isSwitchFragment) {
+        log("IntroductionFragment: onShow");
+        super.onShow(isSwitchFragment);
+    }
+    
+    @Override
+    public void onHide() {
+        log("IntroductionFragment: onHide");
+        super.onHide();
+    }
+}
diff --git a/app/src/main/java/com/kongzue/baseframeworkdemo/util/AutoHeightListView.java b/app/src/main/java/com/kongzue/baseframeworkdemo/util/AutoHeightListView.java
new file mode 100644
index 0000000..c5ed74b
--- /dev/null
+++ b/app/src/main/java/com/kongzue/baseframeworkdemo/util/AutoHeightListView.java
@@ -0,0 +1,32 @@
+package com.kongzue.baseframeworkdemo.util;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.ListView;
+
+/**
+ * @author: Kongzue
+ * @github: https://github.com/kongzue/
+ * @homepage: http://kongzue.com/
+ * @mail: myzcxhh@live.cn
+ * @createTime: 2019/9/30 14:01
+ */
+public class AutoHeightListView extends ListView {
+    public AutoHeightListView(Context context) {
+        super(context);
+    }
+    
+    public AutoHeightListView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+    
+    public AutoHeightListView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+    
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        int expandSpec = MeasureSpec.makeMeasureSpec(Integer.MAX_VALUE >> 2, MeasureSpec.AT_MOST);
+        super.onMeasure(widthMeasureSpec, expandSpec);
+    }
+}
diff --git a/app/src/main/res/layout/activity_adapter_test.xml b/app/src/main/res/layout/activity_adapter_test.xml
index 8608c2f..ebf9ebd 100644
--- a/app/src/main/res/layout/activity_adapter_test.xml
+++ b/app/src/main/res/layout/activity_adapter_test.xml
@@ -7,7 +7,7 @@
     android:background="@color/colorPrimary"
     android:focusable="true"
     android:focusableInTouchMode="true"
-    tools:context=".AdapterTestActivity">
+    tools:context=".activity.AdapterTestActivity">
 
     <!--此部分为非安全区域，在此处可放置会叠加在状态栏、导航栏下的背景图等内容-->
 
@@ -134,11 +134,11 @@
                         android:textColor="#fff"
                         android:textSize="12dp" />
 
-                    <ListView
+                    <com.kongzue.baseframeworkdemo.util.AutoHeightListView
                         android:id="@+id/list"
                         android:layout_width="match_parent"
-                        android:layout_height="400dp"
-                        android:background="#3f000000"></ListView>
+                        android:layout_height="wrap_content"
+                        android:background="#3f000000"></com.kongzue.baseframeworkdemo.util.AutoHeightListView>
 
                 </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_demo.xml b/app/src/main/res/layout/activity_demo.xml
new file mode 100644
index 0000000..4d8348f
--- /dev/null
+++ b/app/src/main/res/layout/activity_demo.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context=".activity.DemoActivity">
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="140dp"
+        android:layout_alignParentRight="true"
+        android:background="@color/colorPrimary"
+        android:scaleType="fitEnd"
+        android:src="@mipmap/img_bkg" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fitsSystemWindows="true"
+        android:orientation="vertical">
+
+        <FrameLayout
+            android:id="@+id/frame"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:background="#DBDBDB" />
+
+        <com.kongzue.tabbar.TabBarView xmlns:app="http://schemas.android.com/apk/res-auto"
+            android:id="@+id/tabbar"
+            android:layout_width="match_parent"
+            android:layout_height="55dp"
+            android:background="@color/colorWhite"
+            app:focusColor="#3e78ed"
+            app:iconPadding="2dp"
+            app:normalColor="#606060"
+            app:tabClickBackground="rippleOutside"
+            app:paddingNavigationBar="false"
+            app:tabPaddingVertical="5dp"
+            app:textSize="12dp" />
+
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_jump.xml b/app/src/main/res/layout/activity_jump.xml
index 5fe196b..24a36e9 100644
--- a/app/src/main/res/layout/activity_jump.xml
+++ b/app/src/main/res/layout/activity_jump.xml
@@ -6,7 +6,7 @@
     android:focusable="true"
     android:focusableInTouchMode="true"
     android:orientation="vertical"
-    tools:context="com.kongzue.baseframeworkdemo.JumpActivity">
+    tools:context="com.kongzue.baseframeworkdemo.activity.JumpActivity">
 
     <!--此部分为非安全区域，在此处可放置会叠加在状态栏、导航栏下的背景图等内容-->
 
@@ -20,7 +20,7 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:orientation="vertical">
 
             <LinearLayout
@@ -31,12 +31,18 @@
 
                 <!--这个是我自制的ActionBar，需要的话也可以自定义-->
 
+                <ImageView
+                    android:id="@+id/back"
+                    android:layout_width="55dp"
+                    android:layout_height="55dp"
+                    android:padding="18dp"
+                    android:src="@mipmap/img_back"/>
+
                 <TextView
                     android:id="@+id/txt_title"
                     android:layout_width="wrap_content"
                     android:layout_height="55dp"
                     android:layout_centerHorizontal="true"
-                    android:layout_marginLeft="20dp"
                     android:layout_weight="1"
                     android:gravity="center_vertical"
                     android:text="jump(...)测试"
@@ -46,7 +52,8 @@
 
             <ScrollView
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="match_parent"
+                android:layout_weight="1">
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -137,6 +144,14 @@
                 </LinearLayout>
 
             </ScrollView>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="10dp"
+                android:text="→ 侧滑以关闭"
+                android:textColor="@color/colorWhite"/>
+
         </LinearLayout>
 
     </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_response.xml b/app/src/main/res/layout/activity_response.xml
index 3d4883d..f5cddac 100644
--- a/app/src/main/res/layout/activity_response.xml
+++ b/app/src/main/res/layout/activity_response.xml
@@ -6,7 +6,7 @@
     android:focusable="true"
     android:focusableInTouchMode="true"
     android:orientation="vertical"
-    tools:context="com.kongzue.baseframeworkdemo.JumpActivity">
+    tools:context="com.kongzue.baseframeworkdemo.activity.JumpActivity">
 
     <!--此部分为非安全区域，在此处可放置会叠加在状态栏、导航栏下的背景图等内容-->
 
@@ -31,12 +31,18 @@
 
                 <!--这个是我自制的ActionBar，需要的话也可以自定义-->
 
+                <ImageView
+                    android:id="@+id/back"
+                    android:layout_width="55dp"
+                    android:layout_height="55dp"
+                    android:padding="18dp"
+                    android:src="@mipmap/img_back"/>
+
                 <TextView
                     android:id="@+id/txt_title"
                     android:layout_width="wrap_content"
                     android:layout_height="55dp"
                     android:layout_centerHorizontal="true"
-                    android:layout_marginLeft="20dp"
                     android:layout_weight="1"
                     android:gravity="center_vertical"
                     android:text="Response测试"
@@ -47,6 +53,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:layout_weight="1"
                 android:background="#fff"
                 android:orientation="vertical"
                 android:paddingHorizontal="15dp">
@@ -112,7 +119,8 @@
 
                 <HorizontalScrollView
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1">
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -128,7 +136,15 @@
 
                 </HorizontalScrollView>
 
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="10dp"
+                    android:text="→ 侧滑以关闭"
+                    android:textColor="#000" />
+
             </LinearLayout>
+
         </LinearLayout>
 
     </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_transition.xml b/app/src/main/res/layout/activity_transition.xml
index bf01ac9..b915ed5 100644
--- a/app/src/main/res/layout/activity_transition.xml
+++ b/app/src/main/res/layout/activity_transition.xml
@@ -6,7 +6,7 @@
     android:focusable="true"
     android:focusableInTouchMode="true"
     android:orientation="vertical"
-    tools:context="com.kongzue.baseframeworkdemo.JumpActivity">
+    tools:context="com.kongzue.baseframeworkdemo.activity.JumpActivity">
 
     <!--此部分为非安全区域，在此处可放置会叠加在状态栏、导航栏下的背景图等内容-->
 
@@ -28,5 +28,4 @@
 
     </RelativeLayout>
 
-
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
new file mode 100644
index 0000000..0a59b94
--- /dev/null
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <WebView
+        android:id="@+id/webView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"></WebView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_function.xml b/app/src/main/res/layout/fragment_function.xml
new file mode 100644
index 0000000..9681777
--- /dev/null
+++ b/app/src/main/res/layout/fragment_function.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="match_parent"
+        android:layout_height="55dp"
+        android:layout_centerHorizontal="true"
+        android:gravity="center_vertical"
+        android:paddingLeft="20dp"
+        android:text="@string/function"
+        android:textColor="#ffffff"
+        android:textSize="20sp" />
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#fff">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingHorizontal="15dp"
+            android:paddingVertical="10dp">
+
+            <Button
+                android:id="@+id/intentToBaseAdapter"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:text="查看BaseAdapter的Demo" />
+
+            <Button
+                android:id="@+id/btn_jump"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="带自定义参数的跳转" />
+
+            <Button
+                android:id="@+id/btn_result"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="更简单的跳转后返回数据" />
+
+            <Button
+                android:id="@+id/btn_transition"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="跳转共享元素动画"
+                android:transitionName="test" />
+
+            <Button
+                android:id="@+id/btn_permission"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="申请权限（测试用，无实际业务逻辑）" />
+
+            <Button
+                android:id="@+id/btn_error"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="触发一个崩溃（不会闪退）" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="请使用Logcat查看:"/>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <Button
+                    android:id="@+id/btn_printJsonLog"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="打印json数据" />
+
+                <Button
+                    android:id="@+id/btn_printMapLog"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="打印Map数据" />
+
+                <Button
+                    android:id="@+id/btn_printListLog"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="打印List数据" />
+
+            </LinearLayout>
+
+            <Button
+                android:id="@+id/btn_getImei"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="获取IMEI" />
+
+            <Button
+                android:id="@+id/btn_changeLng"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/btn_change_lng" />
+
+            <Button
+                android:id="@+id/btn_toast"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="兼容Toast提示" />
+
+            <Button
+                android:id="@+id/btn_timer"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="主线程计时器" />
+
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="请注意"
+                android:textSize="20dp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:text="· 在BaseActivity中，约定关键词me代替Activity.this，因此您在编写代码时，在异步线程中可以轻松使用me关键字直接引用当前Activity。\n\n· 在BaseActivity以及BaseFramework框架中，我们不推荐重写onCreate()方法，而推荐直接在您的class上使用注解@Layout(您的资源文件布局，例如R.layout.xxx)其余的步骤会自动完成。\n\n· 在BaseActivity中您可以使用多种小工具，包含不限于：\n//简易吐司：\ntoast(Obj);\n//简易Log打印日志：\nlog(Obj);\n//软键盘开关：\nsetIMMStatus(boolean show, EditText editText);\n//dip与像素px转换：\ndip2px(Context context, float dpValue);\n//像素px与dip转换：\ndip2px(Context context, float dpValue);\n//申请权限：\nrequestPermission(new String[]{Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION}, new OnPermissionResponseListener() {...});\n//属性动画：\nmoveAnimation(Object obj, String perference, float aimValue, long time, long delay);\n//数据判空（适合网络返回值判断处理，即便为字符串“null”也为空）：\nisNull(String);"
+                android:textSize="12dp" />
+
+        </LinearLayout>
+    </ScrollView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_introduction.xml b/app/src/main/res/layout/fragment_introduction.xml
new file mode 100644
index 0000000..1a1e201
--- /dev/null
+++ b/app/src/main/res/layout/fragment_introduction.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="55dp"
+            android:layout_centerHorizontal="true"
+            android:paddingLeft="20dp"
+            android:gravity="center_vertical"
+            android:text="@string/app_name"
+            android:textColor="#ffffff"
+            android:textSize="20sp" />
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="#fff">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingHorizontal="15dp"
+                android:paddingVertical="10dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="#000"
+                    android:text="@string/introduction"
+                    android:textSize="20dp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5dp"
+                    android:text="@string/introduction_tip"
+                    android:textColor="#000"
+                    android:textSize="12dp" />
+
+                <TextView
+                    android:id="@+id/link_home"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5dp"
+                    android:text="@string/viewOnGithub"
+                    android:textColor="#4472c4"
+                    android:textSize="12dp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="15dp"
+                    android:text="@string/menu"
+                    android:textColor="#000"
+                    android:textSize="20dp" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5dp"
+                    android:lineSpacingExtra="3dp"
+                    android:textColor="#000"
+                    android:text="@string/menu_tip"
+                    android:textSize="12dp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="#000"
+                    android:layout_marginTop="15dp"
+                    android:text="@string/license"
+                    android:textSize="20dp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5dp"
+                    android:text="@string/license_tip"
+                    android:textColor="#000"
+                    android:textSize="12dp" />
+
+            </LinearLayout>
+        </ScrollView>
+
+    </LinearLayout>
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/btn_fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentBottom="true"
+        android:layout_margin="16dp"
+        android:tint="@color/colorWhite"
+        app:backgroundTint="@color/colorPrimary"
+        android:src="@mipmap/img_maintab_function"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-xhdpi/img_back.png b/app/src/main/res/mipmap-xhdpi/img_back.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ea8c5e208faead517b57e1cf6cf6375283f1307
GIT binary patch
literal 1014
zcmV<S0}1?zP)<h;3K|Lk000e1NJLTq004IY003kN1^@s6ynC;|000BMNkl<ZcwX(@
z?QzsF5C-6VJAe+L1E_#p2~<GR0apP@2S){v4k#h1fKUNR2c!Zs%iR57&W>e$taj~J
zGa1iKY)jflwx#oA0|{J)VR$DZUqs~M*o_Af*#pq+<_n@mU>Jr=5&1UJ{wo0AqxP*<
zyF=p6z-ny%h{$g1S8zDo1lZHSzX5Pv>nezNo=~_8VAbLt!0A~W(Wbb~VQ?41YG7^w
z=yQ3qB?N8;tb*#S`LJ185pj>33A_1QvJPt3xS6oOblnR;XUv-}ZgB})J}zD261E)H
z<!za;bzt4$61E<!D_p|Xg>{2V*!r+8a0%N6wmWVn?DKIQ%XhXj<D%PAh_LOh*wdN2
z;1aeyY?s?IVQpZ|aS3Y&Yl=%)TUaw(!rH@{;1aeEY;#<~_JeJTOW3}!&2S0ZAGQfD
zVST_>$0e*E*s8dM^#xlEm$3d|tKbsWCu}h;Vg14u;S$z2Y&I@o{ljMA5;g|xVqC(;
zfn9`4*jTX1xP*-dn}kc)n6R_BgpCXPA}(QL!%pH7Ha_eqE@9UJdxlHc^}zmzn+dDu
zcs%~BD>A-&b9YRlrrXK#?{9?)V10*R{jECy*iUs6!!W!Nk>Bf&!)kl@5x|eJ-YKr8
zuKl#yuCKpij{x3I;r<j6O-juYHv+H6lB(&Is}JQ5ar?!Vi^wD{Z_BaA#}fdZH=Pwu
zsA9uv>!&AFTndHO{R-go<WlJLi-NW86TieTA0RqUx&tu(B}O4I|5=2&ZCZtA*=#be
zU;?Mb+jOtdR7C_fHE34ZWF9I4H;cL1iC;`IMqo3CCKb(QkRx!DxSO1G7Pnv>%t@9B
z;dCWQxCHL3lv#Z;E`c*6-0`qQxCHJfl~MI#TmolAxziz8xCHK`wXoW3TmmnQbcfxG
za0%Q&Y(bU9xCCAhZR1_5;1bwaEwQ?4xCBm&xZ!S9aS3cFmrzx8TmmOV-DsC4xCA!R
zo2jN5E`j?4H^n7zU*P7r1nviHf=l2&z-G7vwg)!FC9o~9IWB?ifV<!l*ao;8E`i$v
zcf~CL*7Qj4$5I8f4_TZVy5klAKZwYVz|(`x1ulWx+zs5|61YCFD_jEC1$Ku^;CjF=
zaS2=p*ex!B%Yj|v765CemtA>yVxPf1ZUOKfz#%qIS?fdKW&+;=xGW1#?4!frW&qy<
zxQNYD*7{Jm3xRI{T$hC>_R-;R6M>&Khcp0v!LZp95;p<(3V@~>-gF6zdj!@D?|SRi
k?JG@osh<Jp8>7vazdh<mgXUj}kpKVy07*qoM6N<$f()hGh5!Hn

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxhdpi/img_maintab_function.png b/app/src/main/res/mipmap-xxhdpi/img_maintab_function.png
new file mode 100644
index 0000000000000000000000000000000000000000..abfb0aa522c5bfb5998323c9256ad1ca9c10a383
GIT binary patch
literal 6005
zcmb`L<zEwA*vCgYdUVT((IG7%4g_J8bT`ON2ndXl8qIEclr)SXf`H`cZYh}}DXoO0
z4y2Ta`+4#F1<#9f&iBRj;`ce%d2yXD(m-F6ikyuc002<IwA796&awX%ko0b^wWuow
z0GO3w>Z&Hec85h2pL-WgMtk{WTRa$2#NlNW*(OFFx@@uW-o|fT&64=OiEDU&%XuKA
zzIS9~!pr#e6Pm@?@u?uKl&+J3+f(%N)udwY-p-%i<Ll6foyE0Zg*$~!^H=YKzT~g@
zPcL2<9{W%GpRcZkL#SApSePE-2+i5B|4U1RL}2FtN(v6=D1!6`<#-ZO=m;AN(^ymA
zg6hu$x#InyyMiKJyn*!09fSn3KMQcWtJLRz^)~OHJ5cUSsZ?y}1851*Kl(h`bO*&>
zM~sUs8~~V1<b99tmJR^E8SkwsebEO1+_*Z8?5{gO{nL7CBEZA~*mFTA<cHkBc++xl
zH9Z9-0xmWCWJ>uCwimsW=a6@C6!Uh=T#N7E|KbSf<C$Ssx-j!hxZl-vLrPu3Z4O=q
zcC2^1DzqnyQu+9{C-mK%64c^iO>hqmlSjdcU;>9;!{_&dV=xquB8fd4n2*o1VRyDO
z@^qg}cn)Tn5~^z@D3OU*hRtN*>tN4hewMESe(Is_i|k#cOxnB4{<XzzK_02%BD0Rd
zkbhqhjOFUQYQz}lKJbeP|C@wK(7wth4Y&qoTipY$v81KLBVk-~S1#hEYayuV9DEMR
zl{oJC1mIE_*2}-=pJdUvrr&n@Djidjf$y!&D>Fr`nBqS1*|xWky|XA;%fxe{R4h(e
ze&4rB0w`$WXb!!Qr_fjuJMO*Y9PbV*!ZB0GBTZZ$t@NX%F>Id(%3EyjY*EYv?;rwD
zP217wu+_jGh6rA0dkZ3$>r8b-03o_p1~z9dGIAH@u&ex*YaJ^9(C&0c4%=pBm|*+I
z`b$`6OCZ9=9OnsXVbfh8G&mC3gL#^|OaUAZBE|MbJY^#Uw)pwtKHgVZH5c$C9qXRI
zakcuYohQGZtF7o|M?az5ZH5TbCil5$dp;@mYO21^_6tjAix~pM7qpWMV@nhLhoCOv
z(v^=VShn#gBFtU;yJbqoDD-_jpzJ4&P3EI7!1P{}I(Rev%yNBDC>USs$$GT}P<z0!
z!RH;)%h$O3kjaK;&nPH?qU9NRpDd(^2WfLdmoY;uyUA`DS3?Hg{<jx~t7H|s)`mUP
zb^JNvUF~)C26dF<r(77*)sA6SP)hU&)dPgIVYrfvZqfq*q=tPD!tvt7?0<7G&tzCP
zk0IgXY%jW*5H>ovW!+4TrgvS@GD|UU+I@MP(|KP%ITG5dN{#1TwxNJVJi&4DGOl_2
z$c2QzuR3gz4;6t$IvH)Q(E%^5YikI=D;B=~-_j$sZ7gyX*nBX0W8z28ad9%XJUrFe
zO9TTK;_0!+gWU3&_}tWZc8_1qe5X9VHmN7wqpiR-K2z;Oz{c`=u5QkCQAYT~#m1m?
zd_iVp_Zm%z>M6R~$b)oD0OM)9S%-ceK>f~*$fbD){!wlBcXYDkB3BhFI2LkKKTcRL
zqGl@X(n0d@yWdJcO`g2=l^U$8t(q>Ok(PX*E_GH#5#2!Kwa$5a(C<+Ee9>NJ_2N|O
zX1vCbm8+T&9LrmOsJN|<D&BBwi;+_}qMPbFmA6X#IsDs*Q6Vq|aA^gLr1kpq`Mx@#
zy{kuOt}9Xw5jx3jGX}jfPx(v=ir%p+nl7j2{mNIdr?_-fp_kfiGoeVxUM3#rR>*A0
zXv7W$KJE+IPPdl;#qO{KrFa>^fg^MYebRkNHRM%f;F7HA)|(V2U{1(ZZSk1s(gW$G
zEtW~&1@2fzTG95l&%~fW>OfG!&0CD70^3oWUfpvAYNZd_Cp_02u-o?La8Cj)<`KJB
zjZ}Y>wwkMhtL6yP#j&1)gti^y-_wR=0mPB_B4`p!&iZ!@>Z9e3x%Y(L_=-j}G|E8R
zq=uYRca*KFJEfA%>QU$UJ^A)*V48IN!%ynwJ8-Ez%O_1!ib1)=iJ6=YAL`@S%o=?u
z_2Tb|k%5eCdq-s)O-Xw=%YL*#GW>flCuYR;6)p;T`K9CJmR%5gMu0s@cs?DKy#Uz<
zcJc|3;SDQ&?(Sm&ai_KpyVs3iPtlxl-#q80ClPA67)~m#`R_&mU;Z@^>FIR^RftyP
zLQWg{{j*#BZ1pRTSO7K4r(4lKyn$8mbdyt%b}<5wfD#V{DSv83T(x;x4!m29D5MCJ
zpv99C?7p!udAi6wlNsxk1an8UkpV2yZP+Cs59l{-?SwJKQj@Xeoj8&=3oSzE6dWLm
zl{Q{Iq5i?~mRqn|0U(-T!&?8s3t4jG?qp~${9*+*r~dX2bFQLM4l%G<^5dv_(O@ex
z+qQE_i@_mMQ|r}hA@fk`*BAWU#mMqix=p_8YXaCakunn)qVL1>?}R77pbJaQ!O`Z+
zQ<Md9%e?E(0O8Vo50acLe!Ij9z~-u-4n231wd(jK3B-IQx#zDw&Wl+Pv&YAg@Zu&y
z`i0cqEFHjozg+B6GQt`+$8XtI%+)PV>)3@^PdAGcGA0C1d-kqn<7-I-I8dH%eZGiJ
zj=pCySyzHQTK-(}$7+oVRQ<6>!-(P_u~I<dJX<f*w%YRIW!3HJPKBcG_EueE2nXlw
z$BHC&@bpKbrN6Yfj?~RMR|4j5>Y}CMKDVI@enTW~3n&5(M7#c7qqxnjILV*~*Al-c
z_%~PQ>P9W8%0&KsE}oI(hlHX|&}}KEB#>pA4Aeu@vnaW1!ux0M4Ysx5+e3|);L&$X
z-_mfhXSWOn(?zR&Q%=E>_nDzqu+j}-U!mi$DA~{u=97&MtpS>SXbL=Wkn`s+RL|oM
z$9s1*{Wl*{Em(S&EQUQpr#g&l$W+P1Mz#Qn(#Vn@15M~PI?d)C7b_vmz_$0ne1$b{
z+0zb@{fAvF&t#y5G7r)deG5#YIZv7PmYsi+d#)!`1k&n$3%d;K<l|`Prlb1rEoJnj
zQO>>!;{8bCJG2k8vpJC(fH7Qrfp4)4d|)91)df^>`Z5ky3&S)**kLP2S*XZtynL1T
z$g*)|iTEA^Og;xcUO|c)IMY!8Rb@m3WqSY4#T(OlX%cQTC%14W5(YA6D7$GgiBNnJ
zs;_$)iob`lYcDTnulV6dSElbrt&O`BvR_@9`Zndy(K}|6yz>?5=@m%q&j2m#)Px19
zCo+s#`jXdtv*GM@p3z@0)gt$=EVQdcP{~yr^ZtQ_E;;VcAo1VwBXZOUhFU_iTs4Qd
zpsuA)f(yc1F+0;QZaR(JU(9<C=%2;rITv0%6pxC0z__(xF->v&#Q2{7!Z8nEK%G`Q
zd`^K#Vbc<Ii!2p`*w7cd?j|Fqr1@0qK-??8{gwR<uzrKYj|_#P&f*vx6F@LsBWtWW
zAl6BsiPU#!SEq^B?oqg)=7NiL#qY}3m64Oh6@y%Sa>*<Wy8!J#uO1qpn<&KP5nVRB
z*uj_9l22|!PV2glJVBa*2Kk()(<tEEBnBSc)2cR$r-`(K<IJ{0@#X7HJX8(kV%3ow
z1Zm>eQw=%H_UEIoh@rus)O&|>1Vz(=m?eBLAV+OXl`%(8rN8n0PXCpA%iqn?ek{60
zx$|G|zY>Q+Bk;2XM26DaB(ph7v#ZN=n%*X@xfMRdHyrx?&!YV)>5zgO1<1E?s7<Hm
zv2_efIMF-`khh7TADz&~sSG`70_Q{Osg}_|^ZFW4u9+IzhxYM{4*2483J*-V4rWq&
zqPP>xv9VrHU(D=YM&=b>%{`KIOf(>`ow&un%Z6Gtb~>>RPmdftBKZ`a1-+pPjmViK
z(ZU}Rx!3A^3{;cqo+$55i&_&RvwLe4iwncp({bbwX5&214Hb7=sqGo+5=G^1+5t#c
zcZu-O#yn$|jS?=Iewo4F^lOHYxC_b6G4wV&-ydHS=g{WCI2wmEm-Qk0A^GpCQq15L
zIoqIPyR?Y){PBlTdioyw-u)&yADz_FER6&ef^z$)-9@gJLibP5oY+F`#^8T<2xB?c
z1qoYjwYlOeQX$KkB)#IwSVKZ{A9wu~CiucaNfMVh0v+ok(?)Wha~H~P(tot6l>kRH
z%a8~0H<we?`~eL`c$4+RLINE|iGz)-U3~I7!N`8akpFT3zEh}W>*(NVf9xc;Q)@1g
z;-Zf!WH`LUhIua0>%k9trq+#Ct-lk-iYV-wp^2j#dQ&`Jqy=7-zR~u~Vt5~$CC=LR
zA`u1AS=<O4A>)M9E24IqS|>?>Tq^P_o%7{fK;*^@3k{i(C8;u6LW-!8X?K$4s4VTH
zfcb=>8u|-~VankwwTcituT!qIldoP{WYhTwjLtk>t2clVaKJ3*5u>_cu*ZZ+c|Scf
z)S}JEqLX8s<AV@7sao9Om$nL2(<F)IUoNMN^0qj_{Ytq1&EmUlKVLYyEki{p2SGzs
znEymgf1{Wl-PL(*>#+eF{WT>{2f?trL<-E<f@Zl|S)L;;M6ZSw7{}FSmUI2__t36a
ziGdCuN4Xe7x~w)66JK4}o$RQ85S@PC4)ARVH2xI>ZbA{psjO~kh3E>;a4dfB$7<20
zzM+Ox_YJ=b%M!Dh?K;>z_-=XE?ia{hwgoxh+V?{p6L%rsgLrk|7G`q^$IYQR9+0U2
z+G-#vLSNXC)2q_5ir$|fT1uQL$RpB#2$Kcs&OhUBbw(6MExMO48mUNxzt$9Zclx#8
zu*rq*y-0aFKm)!3DTdGj`gIg?tG4R<{R0!S2O8Ycq?o!4<i{JgPiZzJ2Hu}6m12F;
z33+(K4GPK(2SI^<Q3Dy`xP&HFB^!?>VG&J0EIW9h6NXP?^4K#pexIeRMYl#p%`K7N
z^}C%o_~nesr<XNfcWv@1`YeT=u}#v1V3seZWo>!&2U?TKrV)SKu5O-;7%2I2RACQ-
zAw!nJL|>k2owzdI`<D>7)0L#>o)5`mv}Bl75Kj=3`8mh^4{z7=+*URLFjs!pqOFT>
zfn<*^t_qT#an)w-lmv&5S4<q>zX~Es*Nu}E7GhN%k2(%NS&EgJ3ittkO-}sJCdnvG
z%xx5}NbwqE?46FHdr^gyngwHCjTQow--pEp1_m9dZST~Q6Ex;{kKIo`C*rIu_!Y;-
z^of}al)M4<U0}&uAyyOC2DYld7oRoM2ru>jEVeA((osVbZFmyjnDo%QS=;Qj8nbu7
zQN8CI_RCuidtT{_z&wcJSU~6F@06RJAmpkl3q$+DOEm>zY6l=v2iU3*tECxQrIQ?9
zqH=P+^;RUnUjvvVk}P<mHc9|ma(U;<9so>LrZiN$Z?I5cuT~io9&75H{~$Oh+j_U4
zaf~&Ut&<3h{|5i-0H8D!W+;eG|40AzjqG0+Y-Px^ilP7<j3!lAp~ps+8R}NhY>f8f
zG?IFq`qD3qH*5&Y$E=NR^wMgWAdBxeACaUEeVSBj5>F3K56Gwl>A9!*B4>E?CyG29
z^0eTNs@bA%S-TUl%P|H8JjxJh(v1b4&m-K}Y72dY1JI%c`5^$fA@*XiBG#FgT3zjC
zUNkIgi!$6@6=D<e<gJ5P_68|%S!mhA<;|+A-8kdMdE82d(dJmNi0rxEW8z3UVk@J<
z4W(9{Z@Z#bZ3F|Q$1a5+r#y7h>VcFD$=$q@Ha)m7cf4}@%<gXFwxo=aR@|}ryC_}!
z_-NL0ui1FSgb<t@^Gj*D=85(Qjn~M`G>IjgFDP?Ru0T#99`tlz4Mj*Gi*(Ak{8@17
zZ_-t4U1<b}YD@C^!u=T=<8&`3n;{SsNEeuuAIBL}6vK&WR&T0(kydiG|2sg$gdDs}
ztEbiFRS>HEs(RTXp?T(>Qp*`I^_?NGYIIRSM1aRwGLR}TZA^-^pbVO?F9(_LG!r5N
zQI0Sjx7{0c$Z}jiri%_Li7rZof8_{Ys3oZNoG+H*-|Td)=)C`F{41nC@<lERpvtOE
z*~T(hb^gkyb2#;QJ=x^k0V!;moV@)mLDb~Jby@0&S5~EvCxfAapz$gVO9mKvvz_v|
z8l1BK12-|MS}dvhE$xEris&=H_;YO{Vx3h(I>UDA2K(znNw*gh8A-dQe|@*;gb;*s
zpt=qPZN`vteFMN_imYbpvYhbQwl)YLdZRG4+)~{!)l$!kPGx4A&>}HvX`Xi`K~7-{
z5WU>wR$L35vpq;m_97dtm$f*37}NBpkxB{RLG>unLZgZbnEyUv?D1cDjMojXeNmgx
z-)qjO@Xma{#${zQx@KLC;Ra}>Fvu3}*SUsU(Kin8z6=s0skD=Prb8HeQ6pa=^L01Q
znIbavzT1;SU%Y>I4?p?Ep3Z^?3{m>N-0fy0^}ry=cHk}N`JR5d_5RYzPpbNvE3kR2
z0j;JkeXHVz(Ccf#`Ej43gT&YMF8`j98DsI(0|+#Qo3{vS@zB~hdQDSrAnYYhF;;NB
ziG%8yR}(4XftdgmWd!rZ%Y-58zVTEote`*=$}-LL2u%3_#up!Ts+#qoJJmk^3_CX6
zPrV5mKqWr4F!5MaeW3Ph#18&uOX+yC!i*l8zgD+3zl#<N^cAfm15aXq#iWI0H8I;7
z9l}?qhPAx_?pGh`X~Sw#Iek;VdJ+LUWPZT&r41P${lGZaPPbe0LM<q!>q#ukiVbI@
ztv?xbP|)1{Z}mufYRSknle3j+%nj#+iF7?lfWNjVi{ejD`>8}1P{Qy$w1G4<U#CZ?
zJ)bIEA#=qw*HdmcG$d1&DE3sLO2x4xLBeCqo1#yDQy6V!oR25VdCLjbqXit;C7Aw2
z-$SSHQrRm(S=utyNS(YaSPzL^OvV4W$M~6*hc{xbb=gOxdaa0{^^~H5>faPG4~^rW
zkQo<*vG)~jrdN#r<=<;&LOgUAm1J-fw6TwHL(N@X&`R*#Xi)DPhz8R*H_X?wT2Vj^
zSe`yrE4BUU2m74gHZ<3-y%d+4C=&Q@Xori?z-jlHB|Wr|D~Wy3Hh;f-3#1h3<5_o2
z;Fj1X>mtydYMBkuHgl<J=0}v4HnB{o5=A_iQ*+TIcqm5RUj~Q)p)x6i+NyneS_onl
z;EFZmwHe->ma%u&+%gXY{i8ajfaRDu!uD+?YuE<;E<R0?B_x&=QiGWsrJq@p!uO6q
z6E%$BX*8ZYo-?J;A!>Mmc4u<fiXeJ=8o#0-$2n8%7WIp-$jlHKKknb`iYVRI;rj}2
z#BL?%SRj_69_2R8>O20|HcC*zZ7uG+%<pVY%05ki=chK4Nmx}MHajKg$C&gpHtn=U
z0na#2gWUwQ>bq<vK=i4Q&E@Xgv|0gCq=w?(y8PKjMnwHkVZg$&&45a+c#irwp|DG>
z)qfg|@6m)sLFgR4?aLDejgDcf#~)~xsvw9`_ABVvNnbRD6a4I!DcF?oUI1f3`WHZB
z9zz(P%e$6p`;?^PxT<K0=M?!FIn1C`p;Q|i5}H#>z~j+DND(j6Xig6{0dPd0q!~DG
zMz98q7v#HTN~xO}6YNjDIcN641|VKg>Jpy}@)fnW4KK3*xHh|j^DAE-l7I`I!)BSo
z__wVyMP*zbQ`o!~SA7YP3o2BcWauVvagH%YCHy`|>J=*=a3@%=rwAEs*ua?at{6Ll
z#z!;r>2Pb9d@j5L<M|s4q~6teC8=5}kux-95>&c?9R-Xb-AWtxTNFvgpQ9XtSW$N}
zRw`$pzEASb!Lm*`-)UQynkdI8Wr}3Z|95Ts|7(#?BJoX)=k=U;qC1@qfNAKf*Qq%~
F{}0cKAf^BS

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxhdpi/img_maintab_me.png b/app/src/main/res/mipmap-xxhdpi/img_maintab_me.png
new file mode 100644
index 0000000000000000000000000000000000000000..1fdb8f957531220bbfb98a2bda67afbe7629be18
GIT binary patch
literal 5337
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxhdpi/img_tab_introduction.png b/app/src/main/res/mipmap-xxhdpi/img_tab_introduction.png
new file mode 100644
index 0000000000000000000000000000000000000000..52037ac2a5777c4837ff8a1b927db47e209131fc
GIT binary patch
literal 3552
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 31a3b12..004649b 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -5,7 +5,15 @@
 
     <string name="introduction">Introduction</string>
     <string name="viewOnGithub">View On Github</string>
-    <string name="introduction_tip">BaseFramework is a summary of my previous programming and development. The purpose is to complete the project development in the fastest way. Therefore, some commonly used small tools, such as simple toast and simple log, are placed in the basic class. You only need to inherit the BaseActivity and BaseFragment from your project. \n In addition, BaseActivity also provides immersive adaptation. You can check Demo\'s source code to learn more. \nThis is a Demo based on BaseActivity.</string>
+    <string name="introduction_tip">The BaseFramework framework includes immersive adaptations, encapsulation of Activity, Fragment, and Adapter, and provides widgets such as permission requests, jumps, delays, prompts, and log output to make it easy to build Android apps quickly.</string>
 
     <string name="other">Others</string>
+    <string name="menu">Function catalog</string>
+    <string name="menu_tip">· BaseActivity function \n···· Immersive \n···· Jump, Activity communication \n···· Return data after simple jump\n··· · Permission application\n····BaseActivity provides a small tool \n···· BaseActivity life cycle \n···· Skid back \n· BaseFragment function \n···· What is BaseFragment\n· ··· FragmentChangeUtil\n· Setting, storage of attribute values ​​Preferences\n· AppManager\n· Asynchronous or synchronous (demo operation)\n· BaseAdapter\n···· JavaBean adaptation method\n···· Map Adaptation method \n···· Binding method for multiple layouts\n···· Data refresh method\n· Enhanced log\n· Behavior and log monitoring\n· Language change tool </string>
+    <string name="license">License</string>
+    <string name="license_tip">Copyright BaseFramework\n\nLicensed under the Apache License, Version 2.0 (the \"License\"); you may not use this file except in compliance with the License. You may obtain a copy of the License at\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software distributed under the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.</string>
+    <string name="function">Function</string>
+    <string name="about">About</string>
+    <string name="github">Github</string>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9fbc30f..25254a9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,19 +1,26 @@
 <resources>
     <string name="app_name">BaseFramework演示</string>
-    <string name="jump_code">jump(JumpActivity.class, new Parameter()\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;.put(\"参数1\", \"这是一段文字参数\")\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;.put(\"参数2\", BitmapFactory.decodeResource(getResources(), R.mipmap.img_bkg))\n );</string>
-    <string name="response_code">jump(ResponseActivity.class, new OnJumpResponseListener() {\n&#160;&#160;&#160;&#160;@Override\n&#160;&#160;&#160;&#160;public void OnResponse(Parameter jumpParameter) {\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;if (jumpParameter==null){\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;toast(\"未返回任何数据\");\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;}else{\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;toast(\"收到返回数据，参数“返回数据1”中的值为：\" + jumpParameter.get(\"返回数据1\"));\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;}\n&#160;&#160;&#160;&#160;}\n });</string>
-    <string name="jump_get_code">String parameter1 = (String) getParameter().get(\"参数1\"); \nif (!isNull(parameter1)) txtP1.setText(\"第一个参数读取到的值为：\" + parameter1); \nBitmap parameter2 = (Bitmap) getParameter().get(\"参数2\"); \nif (parameter2 != null) imgP2.setImageBitmap(parameter2);</string>
-    <string name="response_set_code">if ((boolean) getParameter().get(\"needResponse\") == true) {\n&#160;&#160;&#160;&#160;setResponse(new Parameter().put(\"返回数据1\", \"测试成功\")); \n} </string>
-    <string name="welcome_github"><![CDATA[欢迎Star&Fork！]]></string>
-    <string name="adapter_simple_map">List&lt;Map&lt;String,&#160;Object&gt;&gt;&#160;datas&#160;=&#160;new&#160;ArrayList&lt;&gt;();\nMap&lt;String,&#160;Object&gt;&#160;map&#160;=&#160;new&#160;HashMap&lt;&gt;();\nmap.put("title",&#160;"我是布局1");\ndatas.add(map);\nmap&#160;=&#160;new&#160;HashMap&lt;&gt;();\nmap.put("title",&#160;"我是布局2");\ndatas.add(map);\nmap&#160;=&#160;new&#160;HashMap&lt;&gt;();\nmap.put("title",&#160;"我是布局3");\ndatas.add(map);\nbaseAdapter&#160;=&#160;new&#160;BaseAdapter(me,&#160;datas,&#160;R.layout.item_list_layout1,&#160;new&#160;SimpleMapAdapterSettings()&#160;{\n&#160;&#160;&#160;&#160;@Override\n&#160;&#160;&#160;&#160;public&#160;Object&#160;setViewHolder(View&#160;convertView)&#160;{\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;ViewHolder1&#160;viewHolder1&#160;=&#160;new&#160;ViewHolder1();\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;viewHolder1.txtTitle&#160;=&#160;convertView.findViewById(R.id.txt_title);\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;return&#160;viewHolder1;\n&#160;&#160;&#160;&#160;}\n&#160;&#160;&#160;&#160;\n&#160;&#160;&#160;&#160;@Override\n&#160;&#160;&#160;&#160;public&#160;void&#160;setData(Object&#160;viewHolder,&#160;Map&lt;String,&#160;Object&gt;&#160;data)&#160;{\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;ViewHolder1&#160;viewHolder1&#160;=&#160;(ViewHolder1)&#160;viewHolder;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;viewHolder1.txtTitle.setText(data.get("title")&#160;+&#160;"");\n&#160;&#160;&#160;&#160;}\n});\nlist.setAdapter(baseAdapter);</string>
-    <string name="adapter_simple_bean">List&lt;CustomDatas&gt;&#160;datas&#160;=&#160;new&#160;ArrayList();\ndatas.add(new&#160;CustomDatas().setTitle("我是布局1"));\ndatas.add(new&#160;CustomDatas().setTitle("我是布局2"));\ndatas.add(new&#160;CustomDatas().setTitle("我是布局3"));\nbaseAdapter&#160;=&#160;new&#160;BaseAdapter(me,&#160;datas,&#160;R.layout.item_list_layout1,&#160;new&#160;SimpleAdapterSettings()&#160;{\n&#160;&#160;&#160;&#160;@Override\n&#160;&#160;&#160;&#160;public&#160;Object&#160;setViewHolder(View&#160;convertView)&#160;{\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;ViewHolder1&#160;viewHolder1&#160;=&#160;new&#160;ViewHolder1();\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;viewHolder1.txtTitle&#160;=&#160;convertView.findViewById(R.id.txt_title);\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;return&#160;viewHolder1;\n&#160;&#160;&#160;&#160;}\n&#160;&#160;&#160;&#160;\n&#160;&#160;&#160;&#160;@Override\n&#160;&#160;&#160;&#160;public&#160;void&#160;setData(Object&#160;viewHolder,&#160;BaseAdapter.BaseDataBean&#160;dataBean)&#160;{\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;CustomDatas&#160;data&#160;=&#160;(CustomDatas)&#160;dataBean;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;ViewHolder1&#160;viewHolder1&#160;=&#160;(ViewHolder1)&#160;viewHolder;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;viewHolder1.txtTitle.setText(data.getTitle());\n&#160;&#160;&#160;&#160;}\n});\nlist.setAdapter(baseAdapter);</string>
-    <string name="adapter_multiple_map">List&lt;Map&lt;String,&#160;Object&gt;&gt;&#160;datas&#160;=&#160;new&#160;ArrayList&lt;&gt;();\nMap&lt;String,&#160;Object&gt;&#160;map&#160;=&#160;new&#160;HashMap&lt;&gt;();\nmap.put("type",&#160;0);\nmap.put("title",&#160;"我是布局1");\ndatas.add(map);\nmap&#160;=&#160;new&#160;HashMap&lt;&gt;();\nmap.put("type",&#160;1);\nmap.put("title",&#160;"我是布局2");\ndatas.add(map);\nmap&#160;=&#160;new&#160;HashMap&lt;&gt;();\nmap.put("type",&#160;2);\nmap.put("title",&#160;"我是布局3");\ndatas.add(map);\nMap&lt;Integer,&#160;Integer&gt;&#160;layoutResIdMap&#160;=&#160;new&#160;HashMap&lt;&gt;();\nlayoutResIdMap.put(0,&#160;R.layout.item_list_layout1);\nlayoutResIdMap.put(1,&#160;R.layout.item_list_layout2);\nlayoutResIdMap.put(2,&#160;R.layout.item_list_layout3);\nbaseAdapter&#160;=&#160;new&#160;BaseAdapter(me,&#160;datas,&#160;layoutResIdMap,&#160;new&#160;MultipleMapAdapterSettings()&#160;{\n&#160;&#160;&#160;&#160;@Override\n&#160;&#160;&#160;&#160;public&#160;Object&#160;setViewHolder(int&#160;type,&#160;View&#160;convertView)&#160;{\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;switch&#160;(type)&#160;{\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;case&#160;0:\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;ViewHolder1&#160;viewHolder1&#160;=&#160;new&#160;ViewHolder1();\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;viewHolder1.txtTitle&#160;=&#160;convertView.findViewById(R.id.txt_title);\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;return&#160;viewHolder1;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;case&#160;1:\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;ViewHolder2&#160;viewHolder2&#160;=&#160;new&#160;ViewHolder2();\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;viewHolder2.txtTitle&#160;=&#160;convertView.findViewById(R.id.txt_title);\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;return&#160;viewHolder2;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;case&#160;2:\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;ViewHolder3&#160;viewHolder3&#160;=&#160;new&#160;ViewHolder3();\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;viewHolder3.txtTitle&#160;=&#160;convertView.findViewById(R.id.txt_title);\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;return&#160;viewHolder3;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;default:\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;return&#160;null;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;}\n&#160;&#160;&#160;&#160;}\n&#160;&#160;&#160;&#160;\n&#160;&#160;&#160;&#160;@Override\n&#160;&#160;&#160;&#160;public&#160;void&#160;setData(int&#160;type,&#160;Object&#160;viewHolder,&#160;Map&lt;String,&#160;Object&gt;&#160;data)&#160;{\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;switch&#160;(type)&#160;{\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;case&#160;0:\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;ViewHolder1&#160;viewHolder1&#160;=&#160;(ViewHolder1)&#160;viewHolder;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;viewHolder1.txtTitle.setText((String)&#160;data.get("title"));\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;break;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;case&#160;1:\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;ViewHolder2&#160;viewHolder2&#160;=&#160;(ViewHolder2)&#160;viewHolder;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;viewHolder2.txtTitle.setText((String)&#160;data.get("title"));\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;break;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;case&#160;2:\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;ViewHolder3&#160;viewHolder3&#160;=&#160;(ViewHolder3)&#160;viewHolder;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;viewHolder3.txtTitle.setText((String)&#160;data.get("title"));\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;break;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;}\n&#160;&#160;&#160;&#160;}\n});\nlist.setAdapter(baseAdapter);</string>
-    <string name="adapter_multiple_bean">List&lt;CustomDatas&gt;&#160;datas&#160;=&#160;new&#160;ArrayList();\ndatas.add(new&#160;CustomDatas().setTitle("我是布局1").setType(0));\ndatas.add(new&#160;CustomDatas().setTitle("我是布局2").setType(1));\ndatas.add(new&#160;CustomDatas().setTitle("我是布局3").setType(2));\nMap&lt;Integer,&#160;Integer&gt;&#160;layoutResIdMap&#160;=&#160;new&#160;HashMap&lt;&gt;();\nlayoutResIdMap.put(0,&#160;R.layout.item_list_layout1);\nlayoutResIdMap.put(1,&#160;R.layout.item_list_layout2);\nlayoutResIdMap.put(2,&#160;R.layout.item_list_layout3);\nbaseAdapter&#160;=&#160;new&#160;BaseAdapter(me,&#160;datas,&#160;layoutResIdMap,&#160;new&#160;MultipleAdapterSettings()&#160;{\n&#160;&#160;&#160;&#160;@Override\n&#160;&#160;&#160;&#160;public&#160;Object&#160;setViewHolder(int&#160;type,&#160;View&#160;convertView)&#160;{\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;switch&#160;(type)&#160;{\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;case&#160;0:\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;ViewHolder1&#160;viewHolder1&#160;=&#160;new&#160;ViewHolder1();\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;viewHolder1.txtTitle&#160;=&#160;convertView.findViewById(R.id.txt_title);\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;return&#160;viewHolder1;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;case&#160;1:\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;ViewHolder2&#160;viewHolder2&#160;=&#160;new&#160;ViewHolder2();\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;viewHolder2.txtTitle&#160;=&#160;convertView.findViewById(R.id.txt_title);\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;return&#160;viewHolder2;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;case&#160;2:\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;ViewHolder3&#160;viewHolder3&#160;=&#160;new&#160;ViewHolder3();\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;viewHolder3.txtTitle&#160;=&#160;convertView.findViewById(R.id.txt_title);\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;return&#160;viewHolder3;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;default:\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;return&#160;null;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;}\n&#160;&#160;&#160;&#160;}\n&#160;&#160;&#160;&#160;\n&#160;&#160;&#160;&#160;@Override\n&#160;&#160;&#160;&#160;public&#160;void&#160;setData(int&#160;type,&#160;Object&#160;viewHolder,&#160;BaseAdapter.BaseDataBean&#160;dataBean)&#160;{\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;CustomDatas&#160;data&#160;=&#160;(CustomDatas)&#160;dataBean;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;switch&#160;(type)&#160;{\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;case&#160;0:\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;ViewHolder1&#160;viewHolder1&#160;=&#160;(ViewHolder1)&#160;viewHolder;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;viewHolder1.txtTitle.setText(data.getTitle());\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;break;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;case&#160;1:\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;ViewHolder2&#160;viewHolder2&#160;=&#160;(ViewHolder2)&#160;viewHolder;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;viewHolder2.txtTitle.setText(data.getTitle());\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;break;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;case&#160;2:\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;ViewHolder3&#160;viewHolder3&#160;=&#160;(ViewHolder3)&#160;viewHolder;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;viewHolder3.txtTitle.setText(data.getTitle());\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;break;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;}\n&#160;&#160;&#160;&#160;}\n});\nlist.setAdapter(baseAdapter);</string>
+    <string name="jump_code" translatable="false">jump(JumpActivity.class, new Parameter()\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;.put(\"参数1\", \"这是一段文字参数\")\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;.put(\"参数2\", BitmapFactory.decodeResource(getResources(), R.mipmap.img_bkg))\n );</string>
+    <string name="response_code" translatable="false">jump(ResponseActivity.class, new OnJumpResponseListener() {\n&#160;&#160;&#160;&#160;@Override\n&#160;&#160;&#160;&#160;public void OnResponse(Parameter jumpParameter) {\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;if (jumpParameter==null){\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;toast(\"未返回任何数据\");\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;}else{\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;toast(\"收到返回数据，参数“返回数据1”中的值为：\" + jumpParameter.get(\"返回数据1\"));\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;}\n&#160;&#160;&#160;&#160;}\n });</string>
+    <string name="jump_get_code" translatable="false">String parameter1 = (String) getParameter().get(\"参数1\"); \nif (!isNull(parameter1)) txtP1.setText(\"第一个参数读取到的值为：\" + parameter1); \nBitmap parameter2 = (Bitmap) getParameter().get(\"参数2\"); \nif (parameter2 != null) imgP2.setImageBitmap(parameter2);</string>
+    <string name="response_set_code" translatable="false">if ((boolean) getParameter().get(\"needResponse\") == true) {\n&#160;&#160;&#160;&#160;setResponse(new Parameter().put(\"返回数据1\", \"测试成功\")); \n} </string>
+    <string name="welcome_github" translatable="false"><![CDATA[欢迎Star&Fork！]]></string>
+    <string name="adapter_simple_map" translatable="false">List&lt;Map&lt;String,&#160;Object&gt;&gt;&#160;datas&#160;=&#160;new&#160;ArrayList&lt;&gt;();\nMap&lt;String,&#160;Object&gt;&#160;map&#160;=&#160;new&#160;HashMap&lt;&gt;();\nmap.put("title",&#160;"我是布局1");\ndatas.add(map);\nmap&#160;=&#160;new&#160;HashMap&lt;&gt;();\nmap.put("title",&#160;"我是布局2");\ndatas.add(map);\nmap&#160;=&#160;new&#160;HashMap&lt;&gt;();\nmap.put("title",&#160;"我是布局3");\ndatas.add(map);\nbaseAdapter&#160;=&#160;new&#160;BaseAdapter(me,&#160;datas,&#160;R.layout.item_list_layout1,&#160;new&#160;SimpleMapAdapterSettings()&#160;{\n&#160;&#160;&#160;&#160;@Override\n&#160;&#160;&#160;&#160;public&#160;Object&#160;setViewHolder(View&#160;convertView)&#160;{\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;ViewHolder1&#160;viewHolder1&#160;=&#160;new&#160;ViewHolder1();\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;viewHolder1.txtTitle&#160;=&#160;convertView.findViewById(R.id.txt_title);\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;return&#160;viewHolder1;\n&#160;&#160;&#160;&#160;}\n&#160;&#160;&#160;&#160;\n&#160;&#160;&#160;&#160;@Override\n&#160;&#160;&#160;&#160;public&#160;void&#160;setData(Object&#160;viewHolder,&#160;Map&lt;String,&#160;Object&gt;&#160;data)&#160;{\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;ViewHolder1&#160;viewHolder1&#160;=&#160;(ViewHolder1)&#160;viewHolder;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;viewHolder1.txtTitle.setText(data.get("title")&#160;+&#160;"");\n&#160;&#160;&#160;&#160;}\n});\nlist.setAdapter(baseAdapter);</string>
+    <string name="adapter_simple_bean" translatable="false">List&lt;CustomDatas&gt;&#160;datas&#160;=&#160;new&#160;ArrayList();\ndatas.add(new&#160;CustomDatas().setTitle("我是布局1"));\ndatas.add(new&#160;CustomDatas().setTitle("我是布局2"));\ndatas.add(new&#160;CustomDatas().setTitle("我是布局3"));\nbaseAdapter&#160;=&#160;new&#160;BaseAdapter(me,&#160;datas,&#160;R.layout.item_list_layout1,&#160;new&#160;SimpleAdapterSettings()&#160;{\n&#160;&#160;&#160;&#160;@Override\n&#160;&#160;&#160;&#160;public&#160;Object&#160;setViewHolder(View&#160;convertView)&#160;{\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;ViewHolder1&#160;viewHolder1&#160;=&#160;new&#160;ViewHolder1();\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;viewHolder1.txtTitle&#160;=&#160;convertView.findViewById(R.id.txt_title);\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;return&#160;viewHolder1;\n&#160;&#160;&#160;&#160;}\n&#160;&#160;&#160;&#160;\n&#160;&#160;&#160;&#160;@Override\n&#160;&#160;&#160;&#160;public&#160;void&#160;setData(Object&#160;viewHolder,&#160;BaseAdapter.BaseDataBean&#160;dataBean)&#160;{\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;CustomDatas&#160;data&#160;=&#160;(CustomDatas)&#160;dataBean;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;ViewHolder1&#160;viewHolder1&#160;=&#160;(ViewHolder1)&#160;viewHolder;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;viewHolder1.txtTitle.setText(data.getTitle());\n&#160;&#160;&#160;&#160;}\n});\nlist.setAdapter(baseAdapter);</string>
+    <string name="adapter_multiple_map" translatable="false">List&lt;Map&lt;String,&#160;Object&gt;&gt;&#160;datas&#160;=&#160;new&#160;ArrayList&lt;&gt;();\nMap&lt;String,&#160;Object&gt;&#160;map&#160;=&#160;new&#160;HashMap&lt;&gt;();\nmap.put("type",&#160;0);\nmap.put("title",&#160;"我是布局1");\ndatas.add(map);\nmap&#160;=&#160;new&#160;HashMap&lt;&gt;();\nmap.put("type",&#160;1);\nmap.put("title",&#160;"我是布局2");\ndatas.add(map);\nmap&#160;=&#160;new&#160;HashMap&lt;&gt;();\nmap.put("type",&#160;2);\nmap.put("title",&#160;"我是布局3");\ndatas.add(map);\nMap&lt;Integer,&#160;Integer&gt;&#160;layoutResIdMap&#160;=&#160;new&#160;HashMap&lt;&gt;();\nlayoutResIdMap.put(0,&#160;R.layout.item_list_layout1);\nlayoutResIdMap.put(1,&#160;R.layout.item_list_layout2);\nlayoutResIdMap.put(2,&#160;R.layout.item_list_layout3);\nbaseAdapter&#160;=&#160;new&#160;BaseAdapter(me,&#160;datas,&#160;layoutResIdMap,&#160;new&#160;MultipleMapAdapterSettings()&#160;{\n&#160;&#160;&#160;&#160;@Override\n&#160;&#160;&#160;&#160;public&#160;Object&#160;setViewHolder(int&#160;type,&#160;View&#160;convertView)&#160;{\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;switch&#160;(type)&#160;{\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;case&#160;0:\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;ViewHolder1&#160;viewHolder1&#160;=&#160;new&#160;ViewHolder1();\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;viewHolder1.txtTitle&#160;=&#160;convertView.findViewById(R.id.txt_title);\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;return&#160;viewHolder1;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;case&#160;1:\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;ViewHolder2&#160;viewHolder2&#160;=&#160;new&#160;ViewHolder2();\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;viewHolder2.txtTitle&#160;=&#160;convertView.findViewById(R.id.txt_title);\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;return&#160;viewHolder2;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;case&#160;2:\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;ViewHolder3&#160;viewHolder3&#160;=&#160;new&#160;ViewHolder3();\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;viewHolder3.txtTitle&#160;=&#160;convertView.findViewById(R.id.txt_title);\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;return&#160;viewHolder3;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;default:\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;return&#160;null;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;}\n&#160;&#160;&#160;&#160;}\n&#160;&#160;&#160;&#160;\n&#160;&#160;&#160;&#160;@Override\n&#160;&#160;&#160;&#160;public&#160;void&#160;setData(int&#160;type,&#160;Object&#160;viewHolder,&#160;Map&lt;String,&#160;Object&gt;&#160;data)&#160;{\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;switch&#160;(type)&#160;{\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;case&#160;0:\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;ViewHolder1&#160;viewHolder1&#160;=&#160;(ViewHolder1)&#160;viewHolder;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;viewHolder1.txtTitle.setText((String)&#160;data.get("title"));\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;break;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;case&#160;1:\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;ViewHolder2&#160;viewHolder2&#160;=&#160;(ViewHolder2)&#160;viewHolder;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;viewHolder2.txtTitle.setText((String)&#160;data.get("title"));\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;break;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;case&#160;2:\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;ViewHolder3&#160;viewHolder3&#160;=&#160;(ViewHolder3)&#160;viewHolder;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;viewHolder3.txtTitle.setText((String)&#160;data.get("title"));\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;break;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;}\n&#160;&#160;&#160;&#160;}\n});\nlist.setAdapter(baseAdapter);</string>
+    <string name="adapter_multiple_bean" translatable="false">List&lt;CustomDatas&gt;&#160;datas&#160;=&#160;new&#160;ArrayList();\ndatas.add(new&#160;CustomDatas().setTitle("我是布局1").setType(0));\ndatas.add(new&#160;CustomDatas().setTitle("我是布局2").setType(1));\ndatas.add(new&#160;CustomDatas().setTitle("我是布局3").setType(2));\nMap&lt;Integer,&#160;Integer&gt;&#160;layoutResIdMap&#160;=&#160;new&#160;HashMap&lt;&gt;();\nlayoutResIdMap.put(0,&#160;R.layout.item_list_layout1);\nlayoutResIdMap.put(1,&#160;R.layout.item_list_layout2);\nlayoutResIdMap.put(2,&#160;R.layout.item_list_layout3);\nbaseAdapter&#160;=&#160;new&#160;BaseAdapter(me,&#160;datas,&#160;layoutResIdMap,&#160;new&#160;MultipleAdapterSettings()&#160;{\n&#160;&#160;&#160;&#160;@Override\n&#160;&#160;&#160;&#160;public&#160;Object&#160;setViewHolder(int&#160;type,&#160;View&#160;convertView)&#160;{\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;switch&#160;(type)&#160;{\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;case&#160;0:\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;ViewHolder1&#160;viewHolder1&#160;=&#160;new&#160;ViewHolder1();\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;viewHolder1.txtTitle&#160;=&#160;convertView.findViewById(R.id.txt_title);\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;return&#160;viewHolder1;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;case&#160;1:\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;ViewHolder2&#160;viewHolder2&#160;=&#160;new&#160;ViewHolder2();\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;viewHolder2.txtTitle&#160;=&#160;convertView.findViewById(R.id.txt_title);\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;return&#160;viewHolder2;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;case&#160;2:\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;ViewHolder3&#160;viewHolder3&#160;=&#160;new&#160;ViewHolder3();\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;viewHolder3.txtTitle&#160;=&#160;convertView.findViewById(R.id.txt_title);\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;return&#160;viewHolder3;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;default:\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;return&#160;null;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;}\n&#160;&#160;&#160;&#160;}\n&#160;&#160;&#160;&#160;\n&#160;&#160;&#160;&#160;@Override\n&#160;&#160;&#160;&#160;public&#160;void&#160;setData(int&#160;type,&#160;Object&#160;viewHolder,&#160;BaseAdapter.BaseDataBean&#160;dataBean)&#160;{\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;CustomDatas&#160;data&#160;=&#160;(CustomDatas)&#160;dataBean;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;switch&#160;(type)&#160;{\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;case&#160;0:\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;ViewHolder1&#160;viewHolder1&#160;=&#160;(ViewHolder1)&#160;viewHolder;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;viewHolder1.txtTitle.setText(data.getTitle());\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;break;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;case&#160;1:\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;ViewHolder2&#160;viewHolder2&#160;=&#160;(ViewHolder2)&#160;viewHolder;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;viewHolder2.txtTitle.setText(data.getTitle());\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;break;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;case&#160;2:\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;ViewHolder3&#160;viewHolder3&#160;=&#160;(ViewHolder3)&#160;viewHolder;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;viewHolder3.txtTitle.setText(data.getTitle());\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;break;\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;}\n&#160;&#160;&#160;&#160;}\n});\nlist.setAdapter(baseAdapter);</string>
     <string name="btn_change_lng">切换为英语（本按钮文字会变）</string>
 
     <string name="introduction">简介</string>
     <string name="viewOnGithub">访问BaseFramework官方Github</string>
-    <string name="introduction_tip">BaseFramework框架是我对之前编程开发的一些总结，目的是以最快的方式完成项目开发，因此将一些常用的小工具，例如简易吐司、简易log等放在了基础类中，只需要将您项目中的Activity或Fragment继承本框架中的BaseActivity以及BaseFragment，即可使用。\n除此之外BaseActivity还提供沉浸式适配，您可以查看Demo的源代码来了解更多。\n本界面就是基于BaseActivity实现的Demo。</string>
+    <string name="introduction_tip">BaseFramework框架包含沉浸式适配、对 Activity、Fragment 以及 Adapter 的封装，并提供了一些诸如权限申请、跳转、延时操作、提示、日志输出等小工具，以方便快速构建 Android App；</string>
 
     <string name="other">其他功能</string>
+    <string name="menu">功能目录</string>
+    <string name="menu_tip">· BaseActivity功能\n···· 沉浸式\n···· 跳转、Activity间通讯\n···· 更简单的跳转后返回数据\n···· 权限申请\n···· BaseActivity提供的小工具\n···· BaseActivity的生命周期\n···· 侧滑返回\n· BaseFragment功能\n···· BaseFragment 是什么\n···· FragmentChangeUtil\n· 设置、属性值的存储工具 Preferences\n· AppManager\n· 异步或同步（演示操作）\n· BaseAdapter\n···· JavaBean 适配方式\n···· Map 适配方式\n···· 多种布局的绑定方式\n···· 数据刷新方法\n· 增强型日志\n· 行为与日志监听\n· 语言变更工具</string>
+    <string name="license">开源协议</string>
+    <string name="license_tip">Copyright BaseFramework\n\nLicensed under the Apache License, Version 2.0 (the \"License\"); you may not use this file except in compliance with the License. You may obtain a copy of the License at\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software distributed under the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.</string>
+    <string name="function">功能</string>
+    <string name="about">关于</string>
+    <string name="github">Github</string>
 </resources>
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/AppManager.java b/baseframework/src/main/java/com/kongzue/baseframework/util/AppManager.java
index 7790b1a..c48558d 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/util/AppManager.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/util/AppManager.java
@@ -74,6 +74,9 @@ public BaseActivity currentActivity() {
      * @return
      */
     public BaseActivity getActiveActivity() {
+        if (activeActivity == null) {
+            return null;
+        }
         return activeActivity.get();
     }
     

From 44a99965f8c2d2e6d0619736492c945a0ac31e4f Mon Sep 17 00:00:00 2001
From: kongzue <myzcxhh@live.cn>
Date: Mon, 27 Jul 2020 17:45:00 +0800
Subject: [PATCH 11/18] 6.7.5.1 pub

---
 .idea/caches/build_file_checksums.ser           | Bin 592 -> 592 bytes
 baseframework/build.gradle                      |   4 ++--
 .../kongzue/baseframework/util/DebugLogG.java   |   7 ++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 834da8034684e7b74fbe50177e3b48b3c32be295..14644f310e92ceb61e842e91d25fbf4b141fdc05 100644
GIT binary patch
delta 36
ucmV+<0Nel21kePKm;{7194@h(bpa5fc*UgOD_EEe^6rTrMb$HtAp$QKO%Cn=

delta 36
ucmV+<0Nel21kePKm;`$O#?i5ybpa3;0i`te%7l7M_x$aVis00fAp$QkYY|ES

diff --git a/baseframework/build.gradle b/baseframework/build.gradle
index 7378c7d..886fa58 100644
--- a/baseframework/build.gradle
+++ b/baseframework/build.gradle
@@ -6,7 +6,7 @@ def siteUrl = 'https://github.com/kongzue/BaseFramework' //项目在github主页
 def gitUrl = 'https://github.com/kongzue/BaseFramework.git'   //Git仓库的地址
 
 group = "com.kongzue.baseframeworkx"//发布aar前缀根节点
-version = "6.7.5"//发布aar的库版本
+version = "6.7.5.1"//发布aar的库版本
 
 android {
     compileSdkVersion 29
@@ -15,7 +15,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 29
         versionCode 110
-        versionName "6.7.5"
+        versionName "6.7.5.1"
     }
 
     buildTypes {
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/DebugLogG.java b/baseframework/src/main/java/com/kongzue/baseframework/util/DebugLogG.java
index bcdb193..2bded3d 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/util/DebugLogG.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/util/DebugLogG.java
@@ -167,7 +167,12 @@ public static void catchException(Throwable e) {
         if (logFile == null) {
             createWriter();
         }
-        Preferences.getInstance().commit(BaseApp.getPrivateInstance(), "cache", "bugReporterFile", logFile.getAbsolutePath());
+        if (BaseApp.getPrivateInstance() != null) {
+            if (logFile == null) {
+                createWriter();
+            }
+            Preferences.getInstance().commit(BaseApp.getPrivateInstance(), "cache", "bugReporterFile", logFile.getAbsolutePath());
+        }
         showInfo(e);
     }
     

From e85fd887056d5b2c81f55503d54162c6d64f097e Mon Sep 17 00:00:00 2001
From: kongzue <myzcxhh@live.cn>
Date: Fri, 4 Sep 2020 18:54:53 +0800
Subject: [PATCH 12/18] 6.7.6 pub

---
 .idea/caches/build_file_checksums.ser         | Bin 592 -> 592 bytes
 .idea/codeStyles/Project.xml                  |  18 +
 baseframework/build.gradle                    |   6 +-
 .../kongzue/baseframework/BaseActivity.java   |  66 +++-
 .../com/kongzue/baseframework/BaseApp.java    | 267 +++------------
 .../kongzue/baseframework/BaseFragment.java   |  16 +-
 .../interfaces/OnPictureSavedCallBack.java    |  16 +
 .../baseframework/util/AppManager.java        |   2 +-
 .../baseframework/util/PictureCache.java      | 266 +++++++++++++++
 .../baseframework/util/Preferences.java       |   1 +
 .../baseframework/util/SettingsUtil.java      | 307 ++++++++++++++++++
 .../baseframework/view/TableLayout.java       | 192 +++++++++++
 baseframework/src/main/res/values/attrs.xml   |   6 +
 13 files changed, 928 insertions(+), 235 deletions(-)
 create mode 100644 baseframework/src/main/java/com/kongzue/baseframework/interfaces/OnPictureSavedCallBack.java
 create mode 100644 baseframework/src/main/java/com/kongzue/baseframework/util/PictureCache.java
 create mode 100644 baseframework/src/main/java/com/kongzue/baseframework/util/SettingsUtil.java
 create mode 100644 baseframework/src/main/java/com/kongzue/baseframework/view/TableLayout.java

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 14644f310e92ceb61e842e91d25fbf4b141fdc05..9023a966d1ebcc9c8756bb8d6c720d3e88ccaed4 100644
GIT binary patch
delta 37
vcmV+=0NVf11kePKmj!fKx6_NUoDl&K8Dm9#SJ3Ltn4JqNl)X~Nlf40xICv2I

delta 37
vcmV+=0NVf11kePKmj!c#H5@LnoDl&K!EkA<8{@}qnfPiuy6_dblf40xCD0JX

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 681f41a..0d15693 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,5 +1,23 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value>
+          <package name="java.util" alias="false" withSubpackages="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+          <package name="io.ktor" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
+        </value>
+      </option>
+    </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
diff --git a/baseframework/build.gradle b/baseframework/build.gradle
index 886fa58..a672c94 100644
--- a/baseframework/build.gradle
+++ b/baseframework/build.gradle
@@ -6,7 +6,7 @@ def siteUrl = 'https://github.com/kongzue/BaseFramework' //项目在github主页
 def gitUrl = 'https://github.com/kongzue/BaseFramework.git'   //Git仓库的地址
 
 group = "com.kongzue.baseframeworkx"//发布aar前缀根节点
-version = "6.7.5.1"//发布aar的库版本
+version = "6.7.6"//发布aar的库版本
 
 android {
     compileSdkVersion 29
@@ -14,8 +14,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 29
-        versionCode 110
-        versionName "6.7.5.1"
+        versionCode 111
+        versionName "6.7.6"
     }
 
     buildTypes {
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java b/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java
index 0937e3e..b555517 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java
@@ -23,6 +23,7 @@
 import androidx.annotation.ColorInt;
 import androidx.annotation.ColorRes;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.core.app.ActivityCompat;
 import androidx.core.app.SharedElementCallback;
@@ -34,6 +35,7 @@
 import android.util.Log;
 import android.util.Pair;
 import android.view.Display;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowInsets;
@@ -119,7 +121,7 @@ public abstract class BaseActivity extends AppCompatActivity implements SwipeBac
     private boolean darkStatusBarThemeValue = false;
     private boolean darkNavigationBarThemeValue = false;
     private int navigationBarBackgroundColorValue = Color.BLACK;
-    private int layoutResId = android.R.layout.list_content;
+    private int layoutResId = 0;
     private int fragmentLayoutId = -1;
     
     private Bundle savedInstanceState;
@@ -144,9 +146,8 @@ protected void onCreate(Bundle savedInstanceState) {
         
         if (!interceptSetContentView()) {
             layoutResId = resetLayoutResId();
-            if (layoutResId == android.R.layout.list_content) {
+            if (layoutResId == 0) {
                 Log.e("警告！", "请在您的Activity的Class上注解：@Layout(你的layout资源id)");
-                return;
             }
             setContentView(layoutResId);
         }
@@ -740,6 +741,29 @@ public void showIME(boolean show, EditText editText) {
         }
     }
     
+    public void showIME(@NonNull EditText editText) {
+        if (editText == null) {
+            return;
+        }
+        editText.requestFocus();
+        editText.setFocusableInTouchMode(true);
+        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+        imm.showSoftInput(editText, InputMethodManager.SHOW_FORCED);
+    }
+    
+    public void hideIME(@Nullable EditText editText) {
+        if (editText != null) {
+            InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+            imm.hideSoftInputFromWindow(editText.getWindowToken(),  InputMethodManager.HIDE_NOT_ALWAYS);
+        } else {
+            View view = getCurrentFocus();
+            if (view != null) {
+                InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+                imm.hideSoftInputFromWindow(view.getWindowToken(),  InputMethodManager.HIDE_NOT_ALWAYS);
+            }
+        }
+    }
+    
     //兼容用
     @Deprecated
     public void setIMMStatus(boolean show, EditText editText) {
@@ -1526,4 +1550,40 @@ protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
         outState.remove("android:support:fragments");
     }
+    
+    public void click(View v, View.OnClickListener onClickListener) {
+        v.setFocusableInTouchMode(true);
+        v.setOnTouchListener(new View.OnTouchListener() {
+            int touchFlag = 0;
+            
+            @Override
+            public boolean onTouch(View v, MotionEvent event) {
+                switch (event.getAction()) {
+                    case MotionEvent.ACTION_DOWN:
+                        if (touchFlag == 0) {
+                            touchFlag = 1;
+                        }
+                        break;
+                    case MotionEvent.ACTION_UP:
+                        if (touchFlag == 1) {
+                            touchFlag = -1;
+                            onClickListener.onClick(v);
+                            runDelayed(new Runnable() {
+                                @Override
+                                public void run() {
+                                    touchFlag = 0;
+                                }
+                            }, 500);
+                        }
+                        break;
+                    case MotionEvent.ACTION_CANCEL:
+                        if (touchFlag == 1) {
+                            touchFlag = 0;
+                        }
+                        break;
+                }
+                return true;
+            }
+        });
+    }
 }
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/BaseApp.java b/baseframework/src/main/java/com/kongzue/baseframework/BaseApp.java
index 504b6c8..66e8bd5 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/BaseApp.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/BaseApp.java
@@ -7,14 +7,13 @@
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.content.res.Resources;
 import android.graphics.Point;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
-import android.provider.Settings;
 import android.util.DisplayMetrics;
-import android.util.Log;
 import android.view.Display;
 import android.view.WindowInsets;
 import android.view.WindowManager;
@@ -24,14 +23,12 @@
 import com.kongzue.baseframework.interfaces.OnSDKInitializedCallBack;
 import com.kongzue.baseframework.util.AppManager;
 import com.kongzue.baseframework.util.DebugLogG;
-import com.kongzue.baseframework.util.JsonFormat;
+import com.kongzue.baseframework.util.SettingsUtil;
 import com.kongzue.baseframework.util.toast.Toaster;
 
 import java.lang.reflect.Field;
 
-import static com.kongzue.baseframework.BaseFrameworkSettings.BETA_PLAN;
 import static com.kongzue.baseframework.BaseFrameworkSettings.DEBUGMODE;
-import static com.kongzue.baseframework.BaseFrameworkSettings.setNavigationBarHeightZero;
 
 /**
  * @author: Kongzue
@@ -58,6 +55,10 @@ public void initSDKInitialized() {
     public YourApp me;
     private static Application instance;
     
+    public static <App extends BaseApp> App getInstance(Class<App> appClass) {
+        return (App) instance;
+    }
+    
     @Override
     @Deprecated
     public void onCreate() {
@@ -167,18 +168,23 @@ public void run() {
     }
     
     //用于进行dip和px转换
-    public int dip2px(float dpValue) {
-        final float scale = getResources().getDisplayMetrics().density;
+    public static int dip2px(float dpValue) {
+        if (getPrivateInstance() == null) {
+            return (int) (dpValue * (Resources.getSystem().getDisplayMetrics().density) + 0.5f);
+        }
+        final float scale = getPrivateInstance().getResources().getDisplayMetrics().density;
         return (int) (dpValue * scale + 0.5f);
     }
     
     //用于进行px和dip转换
-    public int px2dip(float pxValue) {
-        final float scale = getResources().getDisplayMetrics().density;
+    public static int px2dip(float pxValue) {
+        if (getPrivateInstance() == null) {
+            return (int) (pxValue / (Resources.getSystem().getDisplayMetrics().density) + 0.5f);
+        }
+        final float scale = getPrivateInstance().getResources().getDisplayMetrics().density;
         return (int) (pxValue / scale + 0.5f);
     }
     
-    
     //启动当前应用设置页面
     public void startAppSettings() {
         Intent intent = new Intent(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
@@ -276,12 +282,15 @@ public static boolean isNull(String s) {
     }
     
     //打开指定App
-    public boolean openApp(String packageName) {
-        PackageManager packageManager = getPackageManager();
+    public static boolean openApp(String packageName) {
+        if (getPrivateInstance() == null) {
+            return false;
+        }
+        PackageManager packageManager = getPrivateInstance().getPackageManager();
         if (isInstallApp(packageName)) {
             try {
                 Intent intent = packageManager.getLaunchIntentForPackage(packageName);
-                startActivity(intent);
+                getPrivateInstance().startActivity(intent);
                 return true;
             } catch (Exception e) {
                 if (DEBUGMODE) {
@@ -295,10 +304,10 @@ public boolean openApp(String packageName) {
     }
     
     //检测App是否已安装
-    public boolean isInstallApp(String packageName) {
+    public static boolean isInstallApp(String packageName) {
         PackageInfo packageInfo = null;
         try {
-            packageInfo = getPackageManager().getPackageInfo(packageName, 0);
+            packageInfo = getPrivateInstance().getPackageManager().getPackageInfo(packageName, 0);
         } catch (PackageManager.NameNotFoundException e) {
             e.printStackTrace();
         }
@@ -309,226 +318,32 @@ public static Settings Settings(String path) {
         return new Settings(path);
     }
     
-    /**
-     * 代理属性存储
-     */
-    public static class Settings {
-        
-        public static void init(com.kongzue.baseframework.util.Preferences.ChangeSharedPreferencesPathCallBack changeSharedPreferencesPathCallBack) {
-            com.kongzue.baseframework.util.Preferences.getInstance().setChangeSharedPreferencesPathCallBack(changeSharedPreferencesPathCallBack);
-        }
-        
-        private String path;
+    public static class Settings extends SettingsUtil {
         
         public Settings(String path) {
-            this.path = path;
-        }
-        
-        public static void set(String path, String key, String value) {
-            com.kongzue.baseframework.util.Preferences.getInstance().set(instance, path, key, value);
-        }
-        
-        public static void set(String path, String key, boolean value) {
-            com.kongzue.baseframework.util.Preferences.getInstance().set(instance, path, key, value);
-        }
-        
-        public static void set(String path, String key, int value) {
-            com.kongzue.baseframework.util.Preferences.getInstance().set(instance, path, key, value);
-        }
-        
-        public static void set(String path, String key, float value) {
-            com.kongzue.baseframework.util.Preferences.getInstance().set(instance, path, key, value);
-        }
-        
-        public static void set(String path, String key, long value) {
-            com.kongzue.baseframework.util.Preferences.getInstance().set(instance, path, key, value);
-        }
-        
-        public static void set(String path, String key, double value) {
-            com.kongzue.baseframework.util.Preferences.getInstance().set(instance, path, key, value);
-        }
-        
-        public static void commit(String path, String key, String value) {
-            com.kongzue.baseframework.util.Preferences.getInstance().commit(instance, path, key, value);
-        }
-        
-        public static void commit(String path, String key, boolean value) {
-            com.kongzue.baseframework.util.Preferences.getInstance().commit(instance, path, key, value);
-        }
-        
-        public static void commit(String path, String key, int value) {
-            com.kongzue.baseframework.util.Preferences.getInstance().commit(instance, path, key, value);
-        }
-        
-        public static void commit(String path, String key, float value) {
-            com.kongzue.baseframework.util.Preferences.getInstance().commit(instance, path, key, value);
-        }
-        
-        public static void commit(String path, String key, long value) {
-            com.kongzue.baseframework.util.Preferences.getInstance().commit(instance, path, key, value);
-        }
-        
-        public static void commit(String path, String key, double value) {
-            com.kongzue.baseframework.util.Preferences.getInstance().commit(instance, path, key, value);
-        }
-        
-        public static String getString(String path, String key) {
-            return com.kongzue.baseframework.util.Preferences.getInstance().getString(instance, path, key);
-        }
-        
-        public static String getString(String path, String key, String defaultValue) {
-            return com.kongzue.baseframework.util.Preferences.getInstance().getString(instance, path, key, defaultValue);
-        }
-        
-        public static boolean getBoolean(String path, String key) {
-            return com.kongzue.baseframework.util.Preferences.getInstance().getBoolean(instance, path, key);
-        }
-        
-        public static boolean getBoolean(String path, String key, boolean defaultValue) {
-            return com.kongzue.baseframework.util.Preferences.getInstance().getBoolean(instance, path, key, defaultValue);
-        }
-        
-        public static int getInt(String path, String key) {
-            return com.kongzue.baseframework.util.Preferences.getInstance().getInt(instance, path, key);
-        }
-        
-        public static int getInt(String path, String key, int defaultValue) {
-            return com.kongzue.baseframework.util.Preferences.getInstance().getInt(instance, path, key, defaultValue);
-        }
-        
-        public static float getFloat(String path, String key) {
-            return com.kongzue.baseframework.util.Preferences.getInstance().getFloat(instance, path, key);
-        }
-        
-        public static float getFloat(String path, String key, float defaultValue) {
-            return com.kongzue.baseframework.util.Preferences.getInstance().getFloat(instance, path, key, defaultValue);
-        }
-        
-        public static long getLong(String path, String key) {
-            return com.kongzue.baseframework.util.Preferences.getInstance().getLong(instance, path, key);
-        }
-        
-        public static long getLong(String path, String key, long defaultValue) {
-            return com.kongzue.baseframework.util.Preferences.getInstance().getLong(instance, path, key, defaultValue);
-        }
-        
-        public static double getDouble(String path, String key) {
-            return com.kongzue.baseframework.util.Preferences.getInstance().getDouble(instance, path, key);
-        }
-        
-        public static double getDouble(String path, String key, double defaultValue) {
-            return com.kongzue.baseframework.util.Preferences.getInstance().getDouble(instance, path, key, defaultValue);
-        }
-        
-        public static void clean(String path) {
-            com.kongzue.baseframework.util.Preferences.getInstance().cleanAll(instance, path);
-        }
-        
-        public void set(String key, String value) {
-            Settings.set(path, key, value);
-        }
-        
-        public void set(String key, boolean value) {
-            Settings.set(path, key, value);
-        }
-        
-        public void set(String key, int value) {
-            Settings.set(path, key, value);
-        }
-        
-        public void set(String key, float value) {
-            Settings.set(path, key, value);
-        }
-        
-        public void set(String key, long value) {
-            Settings.set(path, key, value);
-        }
-        
-        public void set(String key, double value) {
-            Settings.set(path, key, value);
-        }
-        
-        public void commit(String key, String value) {
-            Settings.commit(path, key, value);
-        }
-        
-        public void commit(String key, boolean value) {
-            Settings.commit(path, key, value);
-        }
-        
-        public void commit(String key, int value) {
-            Settings.commit(path, key, value);
-        }
-        
-        public void commit(String key, float value) {
-            Settings.commit(path, key, value);
-        }
-        
-        public void commit(String key, long value) {
-            Settings.commit(path, key, value);
-        }
-        
-        public void commit(String key, double value) {
-            Settings.commit(path, key, value);
-        }
-        
-        public String getString(String key) {
-            return getString(path, key);
-        }
-        
-        public String getStringWithDefaultValue(String key, String defaultValue) {
-            return getString(path, key, defaultValue);
-        }
-        
-        public boolean getBoolean(String key) {
-            return getBoolean(path, key);
-        }
-        
-        public boolean getBoolean(String key, boolean defaultValue) {
-            return getBoolean(path, key, defaultValue);
-        }
-        
-        public int getInt(String key) {
-            return getInt(path, key);
-        }
-        
-        public int getInt(String key, int defaultValue) {
-            return getInt(path, key, defaultValue);
-        }
-        
-        public float getFloat(String key) {
-            return getFloat(path, key);
-        }
-        
-        public float getFloat(String key, float defaultValue) {
-            return getFloat(path, key, defaultValue);
-        }
-        
-        public long getLong(String key) {
-            return getLong(path, key);
-        }
-        
-        public long getLong(String key, long defaultValue) {
-            return getLong(path, key, defaultValue);
-        }
-        
-        public double getDouble(String key) {
-            return getDouble(path, key);
-        }
-        
-        public double getDouble(String key, double defaultValue) {
-            return getDouble(path, key, defaultValue);
-        }
-        
-        public void clean() {
-            clean(path);
+            super(path);
         }
     }
     
+    /**
+     * 此方法用于主动设置实例化 application 对象以实现一些需要 context 的场合下不需要传参，减少工作量，
+     * 在您有实现 App extends BaseApp 的情况下无需调用，
+     * 请勿手动调用此方法，此接口仅用于 BaseActivity 以固定逻辑调用。
+     *
+     * @param context Application 上下文
+     * @hide
+     */
     public static void setPrivateInstance(Application context) {
         BaseApp.instance = context;
     }
     
+    /**
+     * 此方法用于主动获取实例化的 application 对象以实现一些需要 context 的场合下不需要传参，减少工作量，
+     * 如需要使用 App 的实例化对象，请勿使用本方法，
+     * 请自行实现 getInstance() 方法，或使用 {@link #getInstance(Class)} 来获取。
+     *
+     * @return 例化的 application 对象
+     */
     public static Application getPrivateInstance() {
         if (instance == null) {
             return null;
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java b/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java
index 085cd1a..eb95b8b 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java
@@ -8,6 +8,7 @@
 
 import androidx.annotation.ColorRes;
 import androidx.annotation.IdRes;
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
@@ -249,7 +250,7 @@ public void onParameterReceived(JumpParameter parameter) {
     }
     
     public final <T extends View> T findViewById(@IdRes int id) {
-        return rootView.findViewById(id);
+        return (T) rootView.findViewById(id);
     }
     
     private Toast toast;
@@ -555,6 +556,14 @@ public void setIMMStatus(boolean show, EditText editText) {
         me.showIME(show, editText);
     }
     
+    public void showIME(@NonNull EditText editText) {
+        me.showIME(editText);
+    }
+    
+    public void hideIME(@Nullable EditText editText) {
+        me.hideIME(editText);
+    }
+    
     /**
      * 不推荐使用 onResume
      * 建议使用 {@link #onLoad()} 或 {@link #onShow(boolean)} 代替。
@@ -731,4 +740,7 @@ public boolean isAddedCompat() {
         return mAdded;
     }
     
-}
\ No newline at end of file
+    public void click(View v, View.OnClickListener onClickListener) {
+        me.click(v, onClickListener);
+    }
+}
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/interfaces/OnPictureSavedCallBack.java b/baseframework/src/main/java/com/kongzue/baseframework/interfaces/OnPictureSavedCallBack.java
new file mode 100644
index 0000000..e33b52d
--- /dev/null
+++ b/baseframework/src/main/java/com/kongzue/baseframework/interfaces/OnPictureSavedCallBack.java
@@ -0,0 +1,16 @@
+package com.kongzue.baseframework.interfaces;
+
+import com.kongzue.baseframework.util.PictureCache;
+
+/**
+ * @author: Kongzue
+ * @github: https://github.com/kongzue/
+ * @homepage: http://kongzue.com/
+ * @mail: myzcxhh@live.cn
+ * @createTime: 2020/8/18 10:49
+ */
+public interface OnPictureSavedCallBack {
+    
+    void onSaved(PictureCache pictureCache);
+    
+}
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/AppManager.java b/baseframework/src/main/java/com/kongzue/baseframework/util/AppManager.java
index c48558d..22dad7a 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/util/AppManager.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/util/AppManager.java
@@ -251,4 +251,4 @@ public interface OnActivityStatusChangeListener {
     public static void setActiveActivity(BaseActivity activeActivity) {
         AppManager.activeActivity = new WeakReference<>(activeActivity);
     }
-}
+}
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/PictureCache.java b/baseframework/src/main/java/com/kongzue/baseframework/util/PictureCache.java
new file mode 100644
index 0000000..09f0c35
--- /dev/null
+++ b/baseframework/src/main/java/com/kongzue/baseframework/util/PictureCache.java
@@ -0,0 +1,266 @@
+package com.kongzue.baseframework.util;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+
+import com.kongzue.baseframework.interfaces.OnPictureSavedCallBack;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Bitmap 缓存器
+ * 此类无须定义目录，可用于缓存 Bitmap
+ * 注意：你可能获得 null 的结果；
+ *
+ * @author: Kongzue
+ * @github: https://github.com/kongzue/
+ * @homepage: http://kongzue.com/
+ * @mail: myzcxhh@live.cn
+ * @createTime: 2020/7/29 18:31
+ */
+public class PictureCache {
+    
+    public static String PICTURE_CACHE_FOLDER = "picCache";
+    private boolean isEmpty = true;
+    private File picFile;
+    private Bitmap bitmapCache;
+    private OnPictureSavedCallBack saveCallBack;
+    
+    private static List<PictureCache> pictureCacheSaveList;
+    
+    private PictureCache() {
+    }
+    
+    /**
+     * 读取图像
+     *
+     * @param context 上下文
+     * @param path    路径
+     * @param key     key
+     */
+    private PictureCache(Context context, String path, String key) {
+        picFile = new File(getFolder(getFolder(context.getCacheDir(), PICTURE_CACHE_FOLDER), path), key);
+        if (picFile.exists()) {
+            isEmpty = false;
+        }
+    }
+    
+    /**
+     * 存储图像
+     *
+     * @param context 上下文
+     * @param path    路径
+     * @param key     key
+     * @param bitmap  图像
+     */
+    private PictureCache(Context context, String path, String key, Bitmap bitmap) {
+        picFile = new File(getFolder(getFolder(context.getCacheDir(), PICTURE_CACHE_FOLDER), path), key);
+        bitmapCache = Bitmap.createBitmap(bitmap);
+        save();
+    }
+    
+    /**
+     * 存储图像(异步)
+     *
+     * @param context 上下文
+     * @param path    路径
+     * @param key     key
+     * @param bitmap  图像
+     */
+    private PictureCache(Context context, String path, String key, Bitmap bitmap, OnPictureSavedCallBack callBack) {
+        picFile = new File(getFolder(getFolder(context.getCacheDir(), PICTURE_CACHE_FOLDER), path), key);
+        bitmapCache = Bitmap.createBitmap(bitmap);
+    }
+    
+    private void save() {
+        try {
+            FileOutputStream out = new FileOutputStream(picFile);
+            bitmapCache.compress(Bitmap.CompressFormat.PNG, 100, out);
+            out.flush();
+            out.close();
+            isEmpty = false;
+            
+            if (saveCallBack != null) saveCallBack.onSaved(this);
+        } catch (Exception e) {
+            isEmpty = true;
+        }
+    }
+    
+    public static PictureCache read(Context context, String path, String key) {
+        return new PictureCache(context, path, key);
+    }
+    
+    public static PictureCache save(Context context, String path, String key, Bitmap bitmap) {
+        return new PictureCache(context, path, key, bitmap);
+    }
+    
+    public static void clean(Context context, String path) {
+        File pathFolder = new File(getFolder(context.getCacheDir(), PICTURE_CACHE_FOLDER), path);
+        deleteFolder(pathFolder);
+    }
+    
+    private static void deleteFolder(File pathFolder) {
+        if (pathFolder.exists()) {
+            if (pathFolder.isDirectory()) {
+                File[] files = pathFolder.listFiles();
+                for (File f : files) {
+                    deleteFolder(f);
+                }
+            } else {
+                pathFolder.delete();
+            }
+            pathFolder.delete();
+        }
+    }
+    
+    public static void saveInBackground(Context context, String path, String key, Bitmap bitmap, OnPictureSavedCallBack callBack) {
+        if (pictureCacheSaveList == null) pictureCacheSaveList = new ArrayList<>();
+        pictureCacheSaveList.add(new PictureCache(context, path, key, bitmap, callBack));
+        tryInBackgroundSave();
+    }
+    
+    private static Thread saveThread;
+    
+    private static void tryInBackgroundSave() {
+        synchronized (PictureCache.class) {
+            if (saveThread == null) {
+                saveThread = new Thread() {
+                    @Override
+                    public void run() {
+                        if (pictureCacheSaveList != null) {
+                            while (!pictureCacheSaveList.isEmpty()) {
+                                PictureCache pc = pictureCacheSaveList.get(0);
+                                pc.save();
+                                pictureCacheSaveList.remove(pc);
+                            }
+                        }
+                    }
+                };
+            }
+            saveThread.start();
+        }
+    }
+    
+    public Bitmap getBitmap() {
+        if (!isEmpty) {
+            try {
+                if (bitmapCache != null && !bitmapCache.isRecycled()) {
+                    return bitmapCache;
+                }
+                bitmapCache = BitmapFactory.decodeFile(picFile.getAbsolutePath());
+                if (bitmapCache != null) {
+                    return bitmapCache;
+                } else {
+                    return tryToReadBigPic(inSampleSizeCache);
+                }
+            } catch (Exception e) {
+                return tryToReadBigPic(inSampleSizeCache);
+            }
+        }
+        return null;
+    }
+    
+    public Bitmap getBitmap(int width, int height) {
+        BitmapFactory.Options options = new BitmapFactory.Options();
+        options.inJustDecodeBounds = true;
+        BitmapFactory.decodeFile(picFile.getAbsolutePath(), options);
+        int outWidth = options.outWidth;
+        int outHeight = options.outHeight;
+        int sampleSize = 1;
+        while (outHeight / sampleSize > height || outWidth / sampleSize > width) {
+            sampleSize *= 2;
+        }
+        options.inJustDecodeBounds = false;
+        return BitmapFactory.decodeFile(picFile.getAbsolutePath(), options);
+    }
+    
+    private static int inSampleSizeCache = 1;
+    
+    /**
+     * 尝试读取压缩图像
+     *
+     * @param inSampleSize 压缩倍率
+     * @return 位图
+     */
+    private Bitmap tryToReadBigPic(int inSampleSize) {
+        try {
+            int maxMemory = (int) (Runtime.getRuntime().maxMemory());
+            BitmapFactory.Options opts = new BitmapFactory.Options();
+            opts.inTempStorage = new byte[maxMemory / (inSampleSize + 1)];
+            opts.inPurgeable = true;
+            opts.inSampleSize = inSampleSize;
+            opts.inInputShareable = true;
+            opts.inPreferredConfig = Bitmap.Config.ARGB_8888;
+            bitmapCache = BitmapFactory.decodeFile(picFile.getAbsolutePath(), opts);
+            inSampleSizeCache = inSampleSize;
+        } catch (Exception e) {
+            if (inSampleSize > 4) {
+                //已经为原图的1/4,不再尝试，内存太小无能为力
+                isEmpty = true;
+                return null;
+            }
+            return tryToReadBigPic(inSampleSize++);
+        }
+        return null;
+    }
+    
+    public File getFile() {
+        return picFile;
+    }
+    
+    public String getFilePath() {
+        return picFile.getAbsolutePath();
+    }
+    
+    public boolean copyTo(String path) {
+        return copyTo(new File(path));
+    }
+    
+    public boolean copyTo(File file) {
+        try {
+            File oldFile = picFile;
+            if (!oldFile.exists()) {
+                return false;
+            }
+            FileInputStream fileInputStream = new FileInputStream(picFile);
+            FileOutputStream fileOutputStream = new FileOutputStream(file);
+            byte[] buffer = new byte[1024];
+            int byteRead;
+            while (-1 != (byteRead = fileInputStream.read(buffer))) {
+                fileOutputStream.write(buffer, 0, byteRead);
+            }
+            fileInputStream.close();
+            fileOutputStream.flush();
+            fileOutputStream.close();
+        } catch (Exception e) {
+            return false;
+        }
+        return true;
+    }
+    
+    private static File getFolder(File dir, String folderName) {
+        File cache = new File(dir, folderName);
+        if (!cache.exists()) {
+            cache.mkdirs();
+        }
+        return cache;
+    }
+    
+    public boolean isEmpty() {
+        return isEmpty;
+    }
+    
+    public OnPictureSavedCallBack getSaveCallBack() {
+        return saveCallBack;
+    }
+    
+    public PictureCache setSaveCallBack(OnPictureSavedCallBack saveCallBack) {
+        this.saveCallBack = saveCallBack;
+        return this;
+    }
+}
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/Preferences.java b/baseframework/src/main/java/com/kongzue/baseframework/util/Preferences.java
index fc41077..d4fdae6 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/util/Preferences.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/util/Preferences.java
@@ -9,6 +9,7 @@
  * Version 2.0
  * Update 2018.5.27
  */
+@Deprecated
 public class Preferences {
     
     private static Preferences preferences;
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/SettingsUtil.java b/baseframework/src/main/java/com/kongzue/baseframework/util/SettingsUtil.java
new file mode 100644
index 0000000..c8532ba
--- /dev/null
+++ b/baseframework/src/main/java/com/kongzue/baseframework/util/SettingsUtil.java
@@ -0,0 +1,307 @@
+package com.kongzue.baseframework.util;
+
+import android.graphics.Bitmap;
+import android.util.Base64;
+
+import com.kongzue.baseframework.BaseApp;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+
+/**
+ * @author: Kongzue
+ * @github: https://github.com/kongzue/
+ * @homepage: http://kongzue.com/
+ * @mail: myzcxhh@live.cn
+ * @createTime: 2020/9/4 18:49
+ */
+public class SettingsUtil {
+    public static void init(Preferences.ChangeSharedPreferencesPathCallBack changeSharedPreferencesPathCallBack) {
+        Preferences.getInstance().setChangeSharedPreferencesPathCallBack(changeSharedPreferencesPathCallBack);
+    }
+    
+    private String path;
+    
+    public SettingsUtil(String path) {
+        this.path = path;
+    }
+    
+    public static void set(String path, String key, String value) {
+        Preferences.getInstance().set(BaseApp.getPrivateInstance(), path, key, value);
+    }
+    
+    public static void set(String path, String key, boolean value) {
+        Preferences.getInstance().set(BaseApp.getPrivateInstance(), path, key, value);
+    }
+    
+    public static void set(String path, String key, int value) {
+        Preferences.getInstance().set(BaseApp.getPrivateInstance(), path, key, value);
+    }
+    
+    public static void set(String path, String key, float value) {
+        Preferences.getInstance().set(BaseApp.getPrivateInstance(), path, key, value);
+    }
+    
+    public static void set(String path, String key, long value) {
+        Preferences.getInstance().set(BaseApp.getPrivateInstance(), path, key, value);
+    }
+    
+    public static void set(String path, String key, double value) {
+        Preferences.getInstance().set(BaseApp.getPrivateInstance(), path, key, value);
+    }
+    
+    public static void set(String path, String key, Bitmap value) {
+        PictureCache.saveInBackground(BaseApp.getPrivateInstance(), path, key, value, null);
+    }
+    
+    public static boolean set(String path, String key, Serializable value) {
+        try {
+            ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+            ObjectOutputStream objectOutputStream = new ObjectOutputStream(byteArrayOutputStream);
+            objectOutputStream.writeObject(value);
+            byte[] byteArray = byteArrayOutputStream.toByteArray();
+            byte[] base64ByteArray = Base64.encode(byteArray, Base64.DEFAULT);
+            String data = new String(base64ByteArray);
+            Preferences.getInstance().set(BaseApp.getPrivateInstance(), path, key, data);
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+    
+    public static void commit(String path, String key, String value) {
+        Preferences.getInstance().commit(BaseApp.getPrivateInstance(), path, key, value);
+    }
+    
+    public static void commit(String path, String key, boolean value) {
+        Preferences.getInstance().commit(BaseApp.getPrivateInstance(), path, key, value);
+    }
+    
+    public static void commit(String path, String key, int value) {
+        Preferences.getInstance().commit(BaseApp.getPrivateInstance(), path, key, value);
+    }
+    
+    public static void commit(String path, String key, float value) {
+        Preferences.getInstance().commit(BaseApp.getPrivateInstance(), path, key, value);
+    }
+    
+    public static void commit(String path, String key, long value) {
+        Preferences.getInstance().commit(BaseApp.getPrivateInstance(), path, key, value);
+    }
+    
+    public static void commit(String path, String key, double value) {
+        Preferences.getInstance().commit(BaseApp.getPrivateInstance(), path, key, value);
+    }
+    
+    public static void commit(String path, String key, Bitmap value) {
+        PictureCache.save(BaseApp.getPrivateInstance(), path, key, value);
+    }
+    
+    public static boolean commit(String path, String key, Serializable value) {
+        try {
+            ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+            ObjectOutputStream objectOutputStream = new ObjectOutputStream(byteArrayOutputStream);
+            objectOutputStream.writeObject(value);
+            byte[] byteArray = byteArrayOutputStream.toByteArray();
+            byte[] base64ByteArray = Base64.encode(byteArray, Base64.DEFAULT);
+            String data = new String(base64ByteArray);
+            Preferences.getInstance().commit(BaseApp.getPrivateInstance(), path, key, data);
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+    
+    public static Bitmap getBitmap(String path, String key) {
+        return PictureCache.read(BaseApp.getPrivateInstance(), path, key).getBitmap();
+    }
+    
+    public static String getString(String path, String key) {
+        return Preferences.getInstance().getString(BaseApp.getPrivateInstance(), path, key);
+    }
+    
+    public static String getString(String path, String key, String defaultValue) {
+        return Preferences.getInstance().getString(BaseApp.getPrivateInstance(), path, key, defaultValue);
+    }
+    
+    public static boolean getBoolean(String path, String key) {
+        return Preferences.getInstance().getBoolean(BaseApp.getPrivateInstance(), path, key);
+    }
+    
+    public static boolean getBoolean(String path, String key, boolean defaultValue) {
+        return Preferences.getInstance().getBoolean(BaseApp.getPrivateInstance(), path, key, defaultValue);
+    }
+    
+    public static int getInt(String path, String key) {
+        return Preferences.getInstance().getInt(BaseApp.getPrivateInstance(), path, key);
+    }
+    
+    public static int getInt(String path, String key, int defaultValue) {
+        return Preferences.getInstance().getInt(BaseApp.getPrivateInstance(), path, key, defaultValue);
+    }
+    
+    public static float getFloat(String path, String key) {
+        return Preferences.getInstance().getFloat(BaseApp.getPrivateInstance(), path, key);
+    }
+    
+    public static float getFloat(String path, String key, float defaultValue) {
+        return Preferences.getInstance().getFloat(BaseApp.getPrivateInstance(), path, key, defaultValue);
+    }
+    
+    public static long getLong(String path, String key) {
+        return Preferences.getInstance().getLong(BaseApp.getPrivateInstance(), path, key);
+    }
+    
+    public static long getLong(String path, String key, long defaultValue) {
+        return Preferences.getInstance().getLong(BaseApp.getPrivateInstance(), path, key, defaultValue);
+    }
+    
+    public static double getDouble(String path, String key) {
+        return Preferences.getInstance().getDouble(BaseApp.getPrivateInstance(), path, key);
+    }
+    
+    public static double getDouble(String path, String key, double defaultValue) {
+        return Preferences.getInstance().getDouble(BaseApp.getPrivateInstance(), path, key, defaultValue);
+    }
+    
+    public static <T> T getObject(String path, String key, Class<T> tClass) {
+        try {
+            String data = getString(path, key);
+            byte[] byteArray = data.getBytes();
+            byte[] base64ByteArray = Base64.decode(byteArray, Base64.DEFAULT);
+            ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(base64ByteArray);
+            ObjectInputStream objectInputStream = new ObjectInputStream(byteArrayInputStream);
+            return (T) objectInputStream.readObject();
+        } catch (Exception e) {
+            return null;
+        }
+    }
+    
+    public static void clean(String path) {
+        Preferences.getInstance().cleanAll(BaseApp.getPrivateInstance(), path);
+        PictureCache.clean(BaseApp.getPrivateInstance(), path);
+    }
+    
+    public void set(String key, String value) {
+        SettingsUtil.set(path, key, value);
+    }
+    
+    public void set(String key, boolean value) {
+        SettingsUtil.set(path, key, value);
+    }
+    
+    public void set(String key, int value) {
+        SettingsUtil.set(path, key, value);
+    }
+    
+    public void set(String key, float value) {
+        SettingsUtil.set(path, key, value);
+    }
+    
+    public void set(String key, long value) {
+        SettingsUtil.set(path, key, value);
+    }
+    
+    public void set(String key, double value) {
+        SettingsUtil.set(path, key, value);
+    }
+    
+    public void set(String key, Bitmap value) {
+        SettingsUtil.set(path, key, value);
+    }
+    
+    public void set(String key, Serializable value) {
+        SettingsUtil.set(path, key, value);
+    }
+    
+    public void commit(String key, String value) {
+        SettingsUtil.commit(path, key, value);
+    }
+    
+    public void commit(String key, boolean value) {
+        SettingsUtil.commit(path, key, value);
+    }
+    
+    public void commit(String key, int value) {
+        SettingsUtil.commit(path, key, value);
+    }
+    
+    public void commit(String key, float value) {
+        SettingsUtil.commit(path, key, value);
+    }
+    
+    public void commit(String key, long value) {
+        SettingsUtil.commit(path, key, value);
+    }
+    
+    public void commit(String key, double value) {
+        SettingsUtil.commit(path, key, value);
+    }
+    
+    public void commit(String key, Serializable value) {
+        SettingsUtil.commit(path, key, value);
+    }
+    
+    public String getString(String key) {
+        return getString(path, key);
+    }
+    
+    public String getStringWithDefaultValue(String key, String defaultValue) {
+        return getString(path, key, defaultValue);
+    }
+    
+    public Bitmap getBitmap(String key) {
+        return getBitmap(path, key);
+    }
+    
+    public boolean getBoolean(String key) {
+        return getBoolean(path, key);
+    }
+    
+    public boolean getBoolean(String key, boolean defaultValue) {
+        return getBoolean(path, key, defaultValue);
+    }
+    
+    public int getInt(String key) {
+        return getInt(path, key);
+    }
+    
+    public int getInt(String key, int defaultValue) {
+        return getInt(path, key, defaultValue);
+    }
+    
+    public float getFloat(String key) {
+        return getFloat(path, key);
+    }
+    
+    public float getFloat(String key, float defaultValue) {
+        return getFloat(path, key, defaultValue);
+    }
+    
+    public long getLong(String key) {
+        return getLong(path, key);
+    }
+    
+    public long getLong(String key, long defaultValue) {
+        return getLong(path, key, defaultValue);
+    }
+    
+    public double getDouble(String key) {
+        return getDouble(path, key);
+    }
+    
+    public double getDouble(String key, double defaultValue) {
+        return getDouble(path, key, defaultValue);
+    }
+    
+    public <T> T getObject(String key, Class<T> tClass) {
+        return getObject(path, key, tClass);
+    }
+    
+    public void clean() {
+        clean(path);
+    }
+}
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/view/TableLayout.java b/baseframework/src/main/java/com/kongzue/baseframework/view/TableLayout.java
new file mode 100644
index 0000000..3f9a28c
--- /dev/null
+++ b/baseframework/src/main/java/com/kongzue/baseframework/view/TableLayout.java
@@ -0,0 +1,192 @@
+package com.kongzue.baseframework.view;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.kongzue.baseframework.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * TableLayout 2.0
+ * Author: @Kongzue
+ * Github: https://github.com/kongzue/
+ * Homepage: http://kongzue.com/
+ * Mail: myzcxhh@live.cn
+ * CreateTime: 2019/4/24 15:51
+ */
+public class TableLayout extends ViewGroup {
+    
+    private int maxColumn = 2;
+    private int itemMargin = 0;
+    private int setChildHeight = dp2px(150);
+    
+    private Context context;
+    
+    public TableLayout(Context context) {
+        super(context);
+        this.context = context;
+        loadAttrs(context, null);
+    }
+    
+    public TableLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        this.context = context;
+        
+        loadAttrs(context, attrs);
+    }
+    
+    public TableLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        this.context = context;
+        
+        loadAttrs(context, attrs);
+    }
+    
+    private void loadAttrs(Context context, AttributeSet attrs) {
+        TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.TableLayout);
+        
+        itemMargin = typedArray.getDimensionPixelOffset(R.styleable.TableLayout_marginDp, 0);
+        setChildHeight = typedArray.getDimensionPixelOffset(R.styleable.TableLayout_itemHeight, dp2px(150));
+        maxColumn = typedArray.getInteger(R.styleable.TableLayout_column, 2);
+        
+        typedArray.recycle();
+    }
+    
+    private List<View> items;
+    private int newHeight = 0;
+    
+    private int[] childTop, childLeft, childRight, childBottom;
+    
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        int maxWidth = resolveSize(Integer.MAX_VALUE, widthMeasureSpec) + itemMargin;
+        int itemWidth = maxWidth / maxColumn - itemMargin;
+        int itemHeight = resolveSize(setChildHeight, heightMeasureSpec);
+        
+        childTop = new int[getChildCount()];
+        childLeft = new int[getChildCount()];
+        childRight = new int[getChildCount()];
+        childBottom = new int[getChildCount()];
+        
+        int l = 0, t = 0, r = 0, b = 0;
+        
+        items = new ArrayList<>();
+        for (int i = 0; i < getChildCount(); i++) {
+            View child = getChildAt(i);
+            if (child.getVisibility() == VISIBLE) {
+                items.add(getChildAt(i));
+            }
+        }
+        
+        //调用每个子view的onMeasure测量子view
+        for (int i = 0; i < items.size(); i++) {
+            View child = items.get(i);
+            //LayoutParams lp = child.getLayoutParams();
+            
+            int childWidthSpec = MeasureSpec.makeMeasureSpec(itemWidth, MeasureSpec.EXACTLY);
+            int childHeightSpec = MeasureSpec.makeMeasureSpec(itemHeight, MeasureSpec.EXACTLY);
+            
+            if (i != 0 && i % maxColumn == 0) {
+                l = 0;
+                t = t + itemHeight + itemMargin;
+            }
+            r = l + itemWidth;
+            b = t + itemHeight;
+            
+            childLeft[i] = l;
+            childTop[i] = t;
+            childRight[i] = r;
+            childBottom[i] = b;
+            
+            l = l + itemWidth + itemMargin;
+            newHeight = t + itemHeight;
+            
+            child.measure(childWidthSpec, childHeightSpec);
+        }
+        
+        int mWidth = resolveSize(itemWidth, widthMeasureSpec);
+        int mHeight = resolveSize(itemHeight, heightMeasureSpec);
+        
+        //setMeasuredDimension(mWidth, mHeight);
+        
+        //refreshViews(widthMeasureSpec, heightMeasureSpec);
+        
+        setMeasuredDimension(mWidth, newHeight);//设置宽高
+    }
+    
+    @Override
+    protected void onLayout(boolean changed, int l, int t, int r, int b) {
+        for (int i = 0; i < items.size(); i++) {
+            View child = items.get(i);
+            child.layout(childLeft[i], childTop[i], childRight[i], childBottom[i]);
+        }
+    }
+    
+    @Override
+    public void addView(View child) {
+        super.addView(child);
+    }
+    
+    @Override
+    public void addView(View child, int index) {
+        super.addView(child, index);
+    }
+    
+    @Override
+    public void addView(View child, int width, int height) {
+        super.addView(child, width, height);
+    }
+    
+    @Override
+    public void addView(View child, LayoutParams params) {
+        super.addView(child, params);
+    }
+    
+    @Override
+    public void addView(View child, int index, LayoutParams params) {
+        super.addView(child, index, params);
+    }
+    
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+    }
+    
+    private int dp2px(float dpValue) {
+        return (int) (0.5f + dpValue * Resources.getSystem().getDisplayMetrics().density);
+    }
+    
+    public int getMaxColumn() {
+        return maxColumn;
+    }
+    
+    public TableLayout setMaxColumn(int maxColumn) {
+        this.maxColumn = maxColumn;
+        return this;
+    }
+    
+    public int getItemMargin() {
+        return itemMargin;
+    }
+    
+    public TableLayout setItemMargin(int itemMargin) {
+        this.itemMargin = itemMargin;
+        return this;
+    }
+    
+    public int getItemHeight() {
+        return setChildHeight;
+    }
+    
+    public TableLayout setItemHeight(int itemHeight) {
+        this.setChildHeight = itemHeight;
+        return this;
+    }
+}
\ No newline at end of file
diff --git a/baseframework/src/main/res/values/attrs.xml b/baseframework/src/main/res/values/attrs.xml
index dbc484f..5ded46d 100644
--- a/baseframework/src/main/res/values/attrs.xml
+++ b/baseframework/src/main/res/values/attrs.xml
@@ -14,4 +14,10 @@
     </declare-styleable>
 
     <attr name="SwipeBackLayoutStyle" format="reference"/>
+
+    <declare-styleable name="TableLayout">
+        <attr name="marginDp" format="dimension"/>
+        <attr name="itemHeight" format="dimension"/>
+        <attr name="column" format="integer"/>
+    </declare-styleable>
 </resources>
\ No newline at end of file

From 485cbfd5ae97fc752273bdd3bcc1a75040a04060 Mon Sep 17 00:00:00 2001
From: kongzue <myzcxhh@live.cn>
Date: Tue, 24 Nov 2020 18:14:09 +0800
Subject: [PATCH 13/18] 6.7.7 pub

---
 .idea/caches/build_file_checksums.ser         | Bin 592 -> 592 bytes
 .idea/compiler.xml                            |   6 ++
 .idea/gradle.xml                              |   1 +
 .idea/misc.xml                                |  24 +++++++-
 baseframework/build.gradle                    |   6 +-
 .../kongzue/baseframework/BaseActivity.java   |  52 +++++++++++++++---
 .../kongzue/baseframework/BaseFragment.java   |  33 ++++++++++-
 .../baseframework/BaseFrameworkSettings.java  |   2 -
 8 files changed, 104 insertions(+), 20 deletions(-)
 create mode 100644 .idea/compiler.xml

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 9023a966d1ebcc9c8756bb8d6c720d3e88ccaed4..6bac306b8567f6338e4a1bc08c330f50d9f6bd54 100644
GIT binary patch
delta 37
tcmcb>a)D*Sbk@?J`;1jL&M9RSV2S?Rn)BrudxD~_-oiZ@F_RUU^Z_#q4>AA%

delta 37
vcmV+=0NVf11kePKmj!fKx6_NUoOJ;ZqIkum-z!*{4D#-YA4SzOlOX~xO|%fq

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..61a9130
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="1.8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 2302033..eab260a 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -15,6 +15,7 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
+        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index ea4df55..d026043 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,27 +5,45 @@
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
     <option name="myNullables">
       <value>
-        <list size="5">
+        <list size="14">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
           <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
           <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
           <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
+          <item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
+          <item index="7" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
+          <item index="10" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
+          <item index="11" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.Nullable" />
+          <item index="12" class="java.lang.String" itemvalue="io.reactivex.annotations.Nullable" />
+          <item index="13" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.Nullable" />
         </list>
       </value>
     </option>
     <option name="myNotNulls">
       <value>
-        <list size="4">
+        <list size="13">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
+          <item index="6" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />
+          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
+          <item index="10" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.NonNull" />
+          <item index="11" class="java.lang.String" itemvalue="io.reactivex.annotations.NonNull" />
+          <item index="12" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.NonNull" />
         </list>
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8 (2)" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8 (2)" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/baseframework/build.gradle b/baseframework/build.gradle
index a672c94..33f4c88 100644
--- a/baseframework/build.gradle
+++ b/baseframework/build.gradle
@@ -6,7 +6,7 @@ def siteUrl = 'https://github.com/kongzue/BaseFramework' //项目在github主页
 def gitUrl = 'https://github.com/kongzue/BaseFramework.git'   //Git仓库的地址
 
 group = "com.kongzue.baseframeworkx"//发布aar前缀根节点
-version = "6.7.6"//发布aar的库版本
+version = "6.7.7"//发布aar的库版本
 
 android {
     compileSdkVersion 29
@@ -14,8 +14,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 29
-        versionCode 111
-        versionName "6.7.6"
+        versionCode 112
+        versionName "6.7.7"
     }
 
     buildTypes {
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java b/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java
index b555517..774608a 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java
@@ -121,7 +121,7 @@ public abstract class BaseActivity extends AppCompatActivity implements SwipeBac
     private boolean darkStatusBarThemeValue = false;
     private boolean darkNavigationBarThemeValue = false;
     private int navigationBarBackgroundColorValue = Color.BLACK;
-    private int layoutResId = 0;
+    private int layoutResId = -1;
     private int fragmentLayoutId = -1;
     
     private Bundle savedInstanceState;
@@ -146,8 +146,9 @@ protected void onCreate(Bundle savedInstanceState) {
         
         if (!interceptSetContentView()) {
             layoutResId = resetLayoutResId();
-            if (layoutResId == 0) {
-                Log.e("警告！", "请在您的Activity的Class上注解：@Layout(你的layout资源id)");
+            if (layoutResId == -1) {
+                errorLog("请在您的Activity的Class上注解：@Layout(你的layout资源id)或重写resetLayoutResId()方法以设置布局");
+                return;
             }
             setContentView(layoutResId);
         }
@@ -160,12 +161,18 @@ protected void onCreate(Bundle savedInstanceState) {
         }
         AppManager.getInstance().pushActivity(me);
         
+        initBindViewAndFunctions();
         initViews();
         initFragments();
         bindAutoEvent();
-        initBindViewAndFunctions();
         initDatas(getParameter());
         setEvents();
+        getRootView().post(new Runnable() {
+            @Override
+            public void run() {
+                lazyInit(getParameter());
+            }
+        });
         
         if (lifeCircleListener != null) {
             lifeCircleListener.onCreate();
@@ -263,6 +270,30 @@ public void onClick(View v) {
         }
     }
     
+    /**
+     * 不推荐使用此方法，推荐重写 onBack()，并使用 return 值确定是否拦截返回按键的事件
+     */
+    @Override
+    @Deprecated
+    public void onBackPressed() {
+        if (!onBack()) {
+            super.onBackPressed();
+        }
+    }
+    
+    /**
+     * 根绝 return 值确定是否允许执行返回指令。
+     * 若当前 Activity 正在显示 Fragment，会优先询问正在显示的 Fragment 是否拦截返回事件。
+     *
+     * @return true：拦截返回指令；false：执行返回指令。
+     */
+    public boolean onBack() {
+        if (fragmentChangeUtil != null && fragmentChangeUtil.getFocusFragment() != null) {
+            return fragmentChangeUtil.getFocusFragment().onBack();
+        }
+        return false;
+    }
+    
     public void setLifeCircleListener(LifeCircleListener lifeCircleListener) {
         this.lifeCircleListener = lifeCircleListener;
     }
@@ -734,10 +765,10 @@ public void showIME(boolean show, EditText editText) {
             editText.requestFocus();
             editText.setFocusableInTouchMode(true);
             InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-            imm.showSoftInput(editText, InputMethodManager.SHOW_FORCED);
+            imm.showSoftInput(editText, InputMethodManager.RESULT_UNCHANGED_SHOWN);
         } else {
             InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-            imm.hideSoftInputFromWindow(editText.getWindowToken(), 0);
+            imm.hideSoftInputFromWindow(editText.getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
         }
     }
     
@@ -748,18 +779,18 @@ public void showIME(@NonNull EditText editText) {
         editText.requestFocus();
         editText.setFocusableInTouchMode(true);
         InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-        imm.showSoftInput(editText, InputMethodManager.SHOW_FORCED);
+        imm.showSoftInput(editText, InputMethodManager.RESULT_UNCHANGED_SHOWN);
     }
     
     public void hideIME(@Nullable EditText editText) {
         if (editText != null) {
             InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-            imm.hideSoftInputFromWindow(editText.getWindowToken(),  InputMethodManager.HIDE_NOT_ALWAYS);
+            imm.hideSoftInputFromWindow(editText.getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
         } else {
             View view = getCurrentFocus();
             if (view != null) {
                 InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-                imm.hideSoftInputFromWindow(view.getWindowToken(),  InputMethodManager.HIDE_NOT_ALWAYS);
+                imm.hideSoftInputFromWindow(view.getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
             }
         }
     }
@@ -1281,6 +1312,9 @@ public JumpParameter getParameter() {
         return jumpParameter;
     }
     
+    protected void lazyInit(JumpParameter parameter) {
+    }
+    
     @Override
     protected void onResume() {
         isActive = true;
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java b/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java
index eb95b8b..2e606db 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java
@@ -93,13 +93,15 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
                 Layout layout = getClass().getAnnotation(Layout.class);
                 if (layout != null && layout.value() != -1) {
                     layoutResId = layout.value();
-                } else {
-                    throw new Exception("请在您的Fragment的Class上注解：@Layout(你的layout资源id)");
                 }
             } catch (Exception e) {
                 e.printStackTrace();
             }
             layoutResId = resetLayoutResId();
+            if (layoutResId == -1) {
+                errorLog("请在您的Fragment的Class上注解：@Layout(你的layout资源id)，或重写resetLayoutResId()方法以设置布局");
+                return null;
+            }
             if (rootView == null) {
                 rootView = LayoutInflater.from(getActivity()).inflate(layoutResId, container, false);
             }
@@ -114,9 +116,20 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
         initBindViewAndFunctions();
         initDatas();
         setEvents();
+        
+        rootView.post(new Runnable() {
+            @Override
+            public void run() {
+                lazyInit(getParameter());
+            }
+        });
+        
         return rootView;
     }
     
+    protected void lazyInit(JumpParameter parameter) {
+    }
+    
     public View interceptSetContentView() {
         return null;
     }
@@ -442,6 +455,16 @@ public void jump(int index, JumpParameter jumpParameter, OnJumpResponseListener
         me.changeFragment(index);
     }
     
+    public void jump(int index, OnJumpResponseListener onJumpResponseListener) {
+        ParameterCache.getInstance().cleanResponse(this.getClass().getName());
+        JumpParameter jumpParameter = new JumpParameter();
+        this.onJumpResponseListener = onJumpResponseListener;
+        ParameterCache.getInstance().set(me.getFragmentChangeUtil().getFragment(index).getClass().getName(),
+                jumpParameter.put("needResponse", true).put("responseClassName", this.getClass().getName())
+        );
+        me.changeFragment(index);
+    }
+    
     //目标Fragment：设定要返回的数据
     public void setFragmentResponse(JumpParameter jumpParameter) {
         ParameterCache.getInstance().setResponse((String) getFragmentParameter().get("responseClassName"), jumpParameter);
@@ -743,4 +766,8 @@ public boolean isAddedCompat() {
     public void click(View v, View.OnClickListener onClickListener) {
         me.click(v, onClickListener);
     }
-}
+    
+    public boolean onBack() {
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/BaseFrameworkSettings.java b/baseframework/src/main/java/com/kongzue/baseframework/BaseFrameworkSettings.java
index 11e667a..d6c61d1 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/BaseFrameworkSettings.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/BaseFrameworkSettings.java
@@ -103,8 +103,6 @@ public static void log(Object s) {
                     Log.v(">>>>>>", logStr);
                 }
             }
-            
-            Log.v(">>>>>>", logStr);
         }
     }
     

From 783acca62c4b83a64a3689c7702fc90f3e895919 Mon Sep 17 00:00:00 2001
From: kongzue <myzcxhh@live.cn>
Date: Sat, 12 Dec 2020 18:01:44 +0800
Subject: [PATCH 14/18] =?UTF-8?q?6.7.7.6=20pub=20-=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E4=BA=86@OnClicks(...)=E6=B3=A8=E8=A7=A3=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=A4=9A=E4=B8=AA=E7=BB=84=E4=BB=B6=E7=9A=84?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E4=BA=8B=E4=BB=B6=EF=BC=9B=20-=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E4=BA=86=E5=9C=A8initDatas()=E3=80=81setEvents()?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E4=B8=AD=E8=B0=83=E7=94=A8jump=E5=B9=B6?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E8=BF=94=E5=9B=9E=E7=9B=91=E5=90=AC=E5=99=A8?=
 =?UTF-8?q?=E6=97=B6=E5=87=BA=E7=8E=B0=E8=BF=94=E5=9B=9E=E7=9B=91=E5=90=AC?=
 =?UTF-8?q?=E5=99=A8=E7=9B=B4=E6=8E=A5=E7=A9=BA=E5=80=BC=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82=20-=20@FragmentLayout(...)?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9EViewPager=E6=94=AF=E6=8C=81=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/caches/build_file_checksums.ser         | Bin 592 -> 592 bytes
 .../activity/DemoActivity.java                |  28 +-
 .../activity/JumpActivity.java                |  14 +-
 .../activity/ResponseActivity.java            |   2 +
 .../activity/TransitionActivity.java          |   2 +
 app/src/main/res/layout/activity_demo.xml     |  17 +-
 baseframework/build.gradle                    |   6 +-
 .../kongzue/baseframework/BaseActivity.java   |  77 ++++-
 .../kongzue/baseframework/BaseFragment.java   |  81 ++++-
 .../baseframework/interfaces/OnClicks.java    |  19 ++
 .../baseframework/util/AppManager.java        |  23 ++
 .../util/DefaultViewPagerAdapter.java         |  37 +++
 .../util/FragmentChangeUtil.java              | 290 ++++++++++++------
 13 files changed, 457 insertions(+), 139 deletions(-)
 create mode 100644 baseframework/src/main/java/com/kongzue/baseframework/interfaces/OnClicks.java
 create mode 100644 baseframework/src/main/java/com/kongzue/baseframework/util/DefaultViewPagerAdapter.java

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 6bac306b8567f6338e4a1bc08c330f50d9f6bd54..3264b133427d6e0033186208a945f3edfe77b3b6 100644
GIT binary patch
delta 37
tcmcb>a)D*Sbk?%4gm1YU=ae!E9O`jBezG_4-9abKb|t<;qLUSw^Z`LP55)ig

delta 37
tcmcb>a)D*Sbk@?J`;1jL&M9RSV2S?Rn)BrudxD~_-oiZ@F_RUU^Z_#q4>AA%

diff --git a/app/src/main/java/com/kongzue/baseframeworkdemo/activity/DemoActivity.java b/app/src/main/java/com/kongzue/baseframeworkdemo/activity/DemoActivity.java
index 8f606a6..f072c5b 100644
--- a/app/src/main/java/com/kongzue/baseframeworkdemo/activity/DemoActivity.java
+++ b/app/src/main/java/com/kongzue/baseframeworkdemo/activity/DemoActivity.java
@@ -10,6 +10,8 @@
 import com.kongzue.baseframework.interfaces.FragmentLayout;
 import com.kongzue.baseframework.interfaces.Layout;
 import com.kongzue.baseframework.interfaces.NavigationBarBackgroundColor;
+import com.kongzue.baseframework.interfaces.NavigationBarBackgroundColorRes;
+import com.kongzue.baseframework.interfaces.OnClicks;
 import com.kongzue.baseframework.interfaces.OnFragmentChangeListener;
 import com.kongzue.baseframework.util.FragmentChangeUtil;
 import com.kongzue.baseframework.util.JumpParameter;
@@ -26,9 +28,9 @@
 
 @Layout(R.layout.activity_demo)
 @DarkStatusBarTheme(false)
-@NavigationBarBackgroundColor(a = 255, r = 255, g = 255, b = 255)
+@NavigationBarBackgroundColorRes(R.color.colorWhite)
 @DarkNavigationBarTheme(true)
-@FragmentLayout(R.id.frame)
+@FragmentLayout(R.id.viewPager)
 public class DemoActivity extends BaseActivity {
     
     private IntroductionFragment introductionFragment = new IntroductionFragment();
@@ -41,10 +43,7 @@ public class DemoActivity extends BaseActivity {
     @Override
     public void initViews() {
         tabbar = findViewById(R.id.tabbar);
-    }
     
-    @Override
-    public void initDatas(JumpParameter parameter) {
         List<Tab> tabs = new ArrayList<>();
         tabs.add(new Tab(this, getString(R.string.introduction), R.mipmap.img_tab_introduction));
         tabs.add(new Tab(this, getString(R.string.function), R.mipmap.img_maintab_function));
@@ -52,11 +51,23 @@ public void initDatas(JumpParameter parameter) {
         tabbar.setTab(tabs);
     }
     
+    @Override
+    public void initDatas(JumpParameter parameter) {
+    }
+    
     @Override
     public void initFragment(FragmentChangeUtil fragmentChangeUtil) {
         fragmentChangeUtil.addFragment(introductionFragment);
         fragmentChangeUtil.addFragment(functionFragment);
         fragmentChangeUtil.addFragment(aboutFragment);
+    
+        getFragmentChangeUtil().setOnFragmentChangeListener(new OnFragmentChangeListener() {
+            @Override
+            public void onChange(int index, BaseFragment fragment) {
+                log("index:"+index);
+                tabbar.setNormalFocusIndex(index);
+            }
+        });
         
         changeFragment(0);
     }
@@ -69,12 +80,5 @@ public void onTabChanged(View v, int index) {
                 changeFragment(index);
             }
         });
-        
-        getFragmentChangeUtil().setOnFragmentChangeListener(new OnFragmentChangeListener() {
-            @Override
-            public void onChange(int index, BaseFragment fragment) {
-                tabbar.setNormalFocusIndex(index);
-            }
-        });
     }
 }
diff --git a/app/src/main/java/com/kongzue/baseframeworkdemo/activity/JumpActivity.java b/app/src/main/java/com/kongzue/baseframeworkdemo/activity/JumpActivity.java
index abc0fa1..363f4c6 100644
--- a/app/src/main/java/com/kongzue/baseframeworkdemo/activity/JumpActivity.java
+++ b/app/src/main/java/com/kongzue/baseframeworkdemo/activity/JumpActivity.java
@@ -8,34 +8,36 @@
 
 import com.kongzue.baseframework.BaseActivity;
 import com.kongzue.baseframework.interfaces.Layout;
+import com.kongzue.baseframework.interfaces.NavigationBarBackgroundColorRes;
 import com.kongzue.baseframework.interfaces.SwipeBack;
 import com.kongzue.baseframework.util.JumpParameter;
 import com.kongzue.baseframeworkdemo.R;
 
 @Layout(R.layout.activity_jump)
 @SwipeBack(true)
+@NavigationBarBackgroundColorRes(R.color.colorPrimary)
 public class JumpActivity extends BaseActivity {
-
+    
     private TextView txtP1;
     private ImageView imgP2;
     private Button btnClose;
-
+    
     @Override
     public void initViews() {
         txtP1 = findViewById(R.id.txt_p1);
         imgP2 = findViewById(R.id.img_p2);
         btnClose = findViewById(R.id.btn_close);
     }
-
+    
     @Override
     public void initDatas(JumpParameter parameter) {
         String parameter1 = (String) getParameter().get("参数1");
         if (!isNull(parameter1)) txtP1.setText("第一个参数读取到的值为：\n" + parameter1);
-
+        
         Bitmap parameter2 = (Bitmap) getParameter().get("参数2");
         if (parameter2 != null) imgP2.setImageBitmap(parameter2);
     }
-
+    
     @Override
     public void setEvents() {
         btnClose.setOnClickListener(new View.OnClickListener() {
@@ -45,5 +47,5 @@ public void onClick(View v) {
             }
         });
     }
-
+    
 }
diff --git a/app/src/main/java/com/kongzue/baseframeworkdemo/activity/ResponseActivity.java b/app/src/main/java/com/kongzue/baseframeworkdemo/activity/ResponseActivity.java
index 73a03f2..9a143bc 100644
--- a/app/src/main/java/com/kongzue/baseframeworkdemo/activity/ResponseActivity.java
+++ b/app/src/main/java/com/kongzue/baseframeworkdemo/activity/ResponseActivity.java
@@ -6,12 +6,14 @@
 
 import com.kongzue.baseframework.BaseActivity;
 import com.kongzue.baseframework.interfaces.Layout;
+import com.kongzue.baseframework.interfaces.NavigationBarBackgroundColorRes;
 import com.kongzue.baseframework.interfaces.SwipeBack;
 import com.kongzue.baseframework.util.JumpParameter;
 import com.kongzue.baseframeworkdemo.R;
 
 @Layout(R.layout.activity_response)
 @SwipeBack(true)
+@NavigationBarBackgroundColorRes(R.color.colorWhite)
 public class ResponseActivity extends BaseActivity {
 
     private TextView txtTitle;
diff --git a/app/src/main/java/com/kongzue/baseframeworkdemo/activity/TransitionActivity.java b/app/src/main/java/com/kongzue/baseframeworkdemo/activity/TransitionActivity.java
index a0dac7c..71aeae0 100644
--- a/app/src/main/java/com/kongzue/baseframeworkdemo/activity/TransitionActivity.java
+++ b/app/src/main/java/com/kongzue/baseframeworkdemo/activity/TransitionActivity.java
@@ -5,12 +5,14 @@
 
 import com.kongzue.baseframework.BaseActivity;
 import com.kongzue.baseframework.interfaces.Layout;
+import com.kongzue.baseframework.interfaces.NavigationBarBackgroundColorRes;
 import com.kongzue.baseframework.interfaces.SwipeBack;
 import com.kongzue.baseframework.util.JumpParameter;
 import com.kongzue.baseframeworkdemo.R;
 
 @Layout(R.layout.activity_transition)
 @SwipeBack(true)
+@NavigationBarBackgroundColorRes(R.color.colorPrimary)
 public class TransitionActivity extends BaseActivity {
     
     private Button btnTransition;
diff --git a/app/src/main/res/layout/activity_demo.xml b/app/src/main/res/layout/activity_demo.xml
index 4d8348f..a71302f 100644
--- a/app/src/main/res/layout/activity_demo.xml
+++ b/app/src/main/res/layout/activity_demo.xml
@@ -21,11 +21,22 @@
         android:fitsSystemWindows="true"
         android:orientation="vertical">
 
-        <FrameLayout
-            android:id="@+id/frame"
+        <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_weight="1" />
+            android:layout_weight="1">
+
+            <FrameLayout
+                android:id="@+id/frame"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+            <androidx.viewpager.widget.ViewPager
+                android:id="@+id/viewPager"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+        </RelativeLayout>
 
         <ImageView
             android:layout_width="match_parent"
diff --git a/baseframework/build.gradle b/baseframework/build.gradle
index 33f4c88..c67e8ef 100644
--- a/baseframework/build.gradle
+++ b/baseframework/build.gradle
@@ -6,7 +6,7 @@ def siteUrl = 'https://github.com/kongzue/BaseFramework' //项目在github主页
 def gitUrl = 'https://github.com/kongzue/BaseFramework.git'   //Git仓库的地址
 
 group = "com.kongzue.baseframeworkx"//发布aar前缀根节点
-version = "6.7.7"//发布aar的库版本
+version = "6.7.7.6"//发布aar的库版本
 
 android {
     compileSdkVersion 29
@@ -14,8 +14,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 29
-        versionCode 112
-        versionName "6.7.7"
+        versionCode 116
+        versionName "6.7.7.6"
     }
 
     buildTypes {
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java b/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java
index 774608a..386b308 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java
@@ -58,6 +58,7 @@
 import com.kongzue.baseframework.interfaces.NavigationBarBackgroundColorInt;
 import com.kongzue.baseframework.interfaces.NavigationBarBackgroundColorRes;
 import com.kongzue.baseframework.interfaces.OnClick;
+import com.kongzue.baseframework.interfaces.OnClicks;
 import com.kongzue.baseframework.interfaces.SwipeBack;
 import com.kongzue.baseframework.util.AppManager;
 import com.kongzue.baseframework.util.CycleRunner;
@@ -256,6 +257,34 @@ public void onClick(View v) {
         } catch (Exception e) {
             e.printStackTrace();
         }
+        try {
+            Method[] methods = getClass().getDeclaredMethods();
+            for (Method method : methods) {
+                if (method.isAnnotationPresent(OnClicks.class)) {
+                    OnClicks onClicks = method.getAnnotation(OnClicks.class);
+                    if (onClicks != null && onClicks.value().length != 0) {
+                        for (int id : onClicks.value()) {
+                            View v = findViewById(id);
+                            v.setOnClickListener(new View.OnClickListener() {
+                                @Override
+                                public void onClick(View v) {
+                                    try {
+                                        method.invoke(me, v);
+                                    } catch (Exception e) {
+                                        try {
+                                            method.invoke(me);
+                                        } catch (Exception e1) {
+                                        }
+                                    }
+                                }
+                            });
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
     
     private void bindAutoEvent() {
@@ -1107,7 +1136,7 @@ public boolean jump(Class<?> cls, JumpParameter jumpParameter, OnJumpResponseLis
             }
             ParameterCache.getInstance().set(cls.getName(), jumpParameter
                     .put("needResponse", true)
-                    .put("responseClassName", me.getClass().getName())
+                    .put("responseClassName", getInstanceKey())
             );
             this.onResponseListener = onResponseListener;
         } catch (Exception e) {
@@ -1258,7 +1287,7 @@ public boolean jump(Class<?> cls, JumpParameter jumpParameter, OnJumpResponseLis
             }
             ParameterCache.getInstance().set(cls.getName(), jumpParameter
                     .put("needResponse", true)
-                    .put("responseClassName", me.getClass().getName())
+                    .put("responseClassName", getInstanceKey())
             );
             this.onResponseListener = onResponseListener;
             
@@ -1295,7 +1324,33 @@ public void jumpAnim(int enterAnim, int exitAnim) {
     
     //目标Activity：设定要返回的数据
     public void setResponse(JumpParameter jumpParameter) {
-        ParameterCache.getInstance().setResponse((String) getParameter().get("responseClassName"), jumpParameter);
+        BaseActivity backResponseActivity = AppManager.getInstance().getActivityInstance(getParameter().getString("responseClassName"));
+        if (backResponseActivity != null) {
+            backResponseActivity.setResponseMessage(jumpParameter);
+        }
+    }
+    
+    private Runnable waitResponseRunnable;
+    
+    protected void setResponseMessage(JumpParameter jumpParameter) {
+        log(getClass().getName() + ".setResponseMessage: " + jumpParameter);
+        waitResponseRunnable = new Runnable() {
+            @Override
+            public void run() {
+                if (onResponseListener != null) {
+                    JumpParameter responseData = jumpParameter;
+                    if (responseData == null) {
+                        responseData = new JumpParameter();
+                    }
+                    onResponseListener.OnResponse(responseData);
+                    onResponseListener = null;
+                }
+            }
+        };
+        if (isActive) {
+            runOnMain(waitResponseRunnable);
+            waitResponseRunnable = null;
+        }
     }
     
     //目标Activity：设定要返回的数据，写法2
@@ -1319,15 +1374,11 @@ protected void lazyInit(JumpParameter parameter) {
     protected void onResume() {
         isActive = true;
         logG("\n" + me.getClass().getSimpleName(), "onResume");
-        if (onResponseListener != null) {
-            JumpParameter responseData = ParameterCache.getInstance().getResponse(me.getClass().getName());
-            if (responseData == null) {
-                responseData = new JumpParameter();
-            }
-            onResponseListener.OnResponse(responseData);
-            onResponseListener = null;
-        }
         super.onResume();
+        if (waitResponseRunnable != null) {
+            runOnMain(waitResponseRunnable);
+            waitResponseRunnable = null;
+        }
         if (lifeCircleListener != null) {
             lifeCircleListener.onResume();
         }
@@ -1620,4 +1671,8 @@ public void run() {
             }
         });
     }
+    
+    public String getInstanceKey() {
+        return getClass().getName() + "@" + Integer.toHexString(hashCode());
+    }
 }
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java b/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java
index 2e606db..02342a3 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java
@@ -23,7 +23,9 @@
 import com.kongzue.baseframework.interfaces.LifeCircleListener;
 import com.kongzue.baseframework.interfaces.Layout;
 import com.kongzue.baseframework.interfaces.OnClick;
+import com.kongzue.baseframework.interfaces.OnClicks;
 import com.kongzue.baseframework.util.CycleRunner;
+import com.kongzue.baseframework.util.FragmentChangeUtil;
 import com.kongzue.baseframework.util.JumpParameter;
 import com.kongzue.baseframework.util.OnPermissionResponseListener;
 import com.kongzue.baseframework.util.OnJumpResponseListener;
@@ -197,6 +199,34 @@ public void onClick(View v) {
         } catch (Exception e) {
             e.printStackTrace();
         }
+        try {
+            Method[] methods = getClass().getDeclaredMethods();
+            for (Method method : methods) {
+                if (method.isAnnotationPresent(OnClicks.class)) {
+                    OnClicks onClicks = method.getAnnotation(OnClicks.class);
+                    if (onClicks != null && onClicks.value().length != 0) {
+                        for (int id : onClicks.value()) {
+                            View v = findViewById(id);
+                            v.setOnClickListener(new View.OnClickListener() {
+                                @Override
+                                public void onClick(View v) {
+                                    try {
+                                        method.invoke(me, v);
+                                    } catch (Exception e) {
+                                        try {
+                                            method.invoke(me);
+                                        } catch (Exception e1) {
+                                        }
+                                    }
+                                }
+                            });
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
     
     private void bindAutoEvent() {
@@ -431,7 +461,7 @@ public void jump(BaseFragment baseFragment, JumpParameter jumpParameter, OnJumpR
         }
         this.onJumpResponseListener = onJumpResponseListener;
         ParameterCache.getInstance().set(baseFragment.getClass().getName(),
-                jumpParameter.put("needResponse", true).put("responseClassName", this.getClass().getName())
+                jumpParameter.put("needResponse", true).put("responseClassName", getInstanceKey())
         );
         me.changeFragment(baseFragment);
     }
@@ -450,7 +480,7 @@ public void jump(int index, JumpParameter jumpParameter, OnJumpResponseListener
         }
         this.onJumpResponseListener = onJumpResponseListener;
         ParameterCache.getInstance().set(me.getFragmentChangeUtil().getFragment(index).getClass().getName(),
-                jumpParameter.put("needResponse", true).put("responseClassName", this.getClass().getName())
+                jumpParameter.put("needResponse", true).put("responseClassName", getInstanceKey())
         );
         me.changeFragment(index);
     }
@@ -460,14 +490,41 @@ public void jump(int index, OnJumpResponseListener onJumpResponseListener) {
         JumpParameter jumpParameter = new JumpParameter();
         this.onJumpResponseListener = onJumpResponseListener;
         ParameterCache.getInstance().set(me.getFragmentChangeUtil().getFragment(index).getClass().getName(),
-                jumpParameter.put("needResponse", true).put("responseClassName", this.getClass().getName())
+                jumpParameter.put("needResponse", true).put("responseClassName", getInstanceKey())
         );
         me.changeFragment(index);
     }
     
     //目标Fragment：设定要返回的数据
     public void setFragmentResponse(JumpParameter jumpParameter) {
-        ParameterCache.getInstance().setResponse((String) getFragmentParameter().get("responseClassName"), jumpParameter);
+        FragmentChangeUtil fragmentChangeUtil = me.getFragmentChangeUtil();
+        BaseFragment baseFragment = fragmentChangeUtil.getFragment(getFragmentParameter().getString("responseClassName"));
+        if (baseFragment != null) {
+            baseFragment.setResponseMessage(jumpParameter);
+        }
+    }
+    
+    private Runnable waitResponseRunnable;
+    
+    protected void setResponseMessage(JumpParameter jumpParameter) {
+        log(getClass().getName() + ".setResponseMessage: " + jumpParameter);
+        waitResponseRunnable = new Runnable() {
+            @Override
+            public void run() {
+                if (onJumpResponseListener != null) {
+                    JumpParameter responseData = jumpParameter;
+                    if (responseData == null) {
+                        responseData = new JumpParameter();
+                    }
+                    onJumpResponseListener.OnResponse(responseData);
+                    onJumpResponseListener = null;
+                }
+            }
+        };
+        if (isActive) {
+            runOnMain(waitResponseRunnable);
+            waitResponseRunnable = null;
+        }
     }
     
     public JumpParameter getFragmentParameter() {
@@ -614,16 +671,12 @@ public void onResume() {
                 if (jumpParameter != null) {
                     onParameterReceived(jumpParameter);
                 }
-                if (onJumpResponseListener != null) {
-                    JumpParameter responseData = ParameterCache.getInstance().getResponse(this.getClass().getName());
-                    if (responseData == null) {
-                        responseData = new JumpParameter();
-                    }
-                    onJumpResponseListener.OnResponse(responseData);
-                    onJumpResponseListener = null;
-                }
             }
         }
+        if (waitResponseRunnable != null) {
+            runOnMain(waitResponseRunnable);
+            waitResponseRunnable = null;
+        }
         isCallShow = false;
         if (lifeCircleListener != null) {
             lifeCircleListener.onResume();
@@ -770,4 +823,8 @@ public void click(View v, View.OnClickListener onClickListener) {
     public boolean onBack() {
         return false;
     }
+    
+    public String getInstanceKey() {
+        return getClass().getName() + "@" + Integer.toHexString(hashCode());
+    }
 }
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/interfaces/OnClicks.java b/baseframework/src/main/java/com/kongzue/baseframework/interfaces/OnClicks.java
new file mode 100644
index 0000000..81a05f6
--- /dev/null
+++ b/baseframework/src/main/java/com/kongzue/baseframework/interfaces/OnClicks.java
@@ -0,0 +1,19 @@
+package com.kongzue.baseframework.interfaces;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author: Kongzue
+ * @github: https://github.com/kongzue/
+ * @homepage: http://kongzue.com/
+ * @mail: myzcxhh@live.cn
+ * @createTime: 2020/11/27 16:03
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface OnClicks {
+    int[] value() default 0;
+}
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/AppManager.java b/baseframework/src/main/java/com/kongzue/baseframework/util/AppManager.java
index 22dad7a..09949a2 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/util/AppManager.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/util/AppManager.java
@@ -224,6 +224,29 @@ public BaseActivity getActivityInstance(Class<?> cls) {
         return null;
     }
     
+    public BaseActivity getActivityInstance(String instanceKey) {
+        if (activityStack == null) {
+            return null;
+        }
+        if (!activityStack.empty()) {
+            Stack<BaseActivity> reverseList = new Stack<BaseActivity>();
+            reverseList.addAll(activityStack);
+            Collections.reverse(reverseList);
+            Iterator<BaseActivity> iterator = reverseList.iterator();
+            BaseActivity temp = null;
+            while (iterator.hasNext()) {
+                BaseActivity activity = iterator.next();
+                if (activity != null && activity.getInstanceKey().equals(instanceKey)) {
+                    temp = activity;
+                }
+            }
+            if (temp != null) {
+                return temp;
+            }
+        }
+        return null;
+    }
+    
     public void onDestroy() {
         activityStack = new Stack<>();
     }
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/DefaultViewPagerAdapter.java b/baseframework/src/main/java/com/kongzue/baseframework/util/DefaultViewPagerAdapter.java
new file mode 100644
index 0000000..35315fe
--- /dev/null
+++ b/baseframework/src/main/java/com/kongzue/baseframework/util/DefaultViewPagerAdapter.java
@@ -0,0 +1,37 @@
+package com.kongzue.baseframework.util;
+
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
+
+import com.kongzue.baseframework.BaseFragment;
+
+import java.util.List;
+
+/**
+ * @author: Kongzue
+ * @github: https://github.com/kongzue/
+ * @homepage: http://kongzue.com/
+ * @mail: myzcxhh@live.cn
+ * @createTime: 2020/11/20 13:22
+ */
+public class DefaultViewPagerAdapter extends FragmentPagerAdapter {
+    
+    private List<BaseFragment> viewList;
+    
+    public DefaultViewPagerAdapter(FragmentManager fm, List<BaseFragment> viewList) {
+        super(fm);
+        this.viewList = viewList;
+    }
+    
+    @Override
+    public int getCount() {
+        return viewList.size();
+    }
+    
+    @Override
+    public Fragment getItem(int position) {
+        BaseFragment fragment = viewList.get(position);
+        return fragment;
+    }
+}
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/FragmentChangeUtil.java b/baseframework/src/main/java/com/kongzue/baseframework/util/FragmentChangeUtil.java
index 216cc0c..e880210 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/util/FragmentChangeUtil.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/util/FragmentChangeUtil.java
@@ -1,12 +1,17 @@
 package com.kongzue.baseframework.util;
 
 import android.util.Log;
+import android.view.View;
+import android.widget.FrameLayout;
 
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentPagerAdapter;
 import androidx.fragment.app.FragmentTransaction;
+import androidx.viewpager.widget.ViewPager;
 
 import com.kongzue.baseframework.BaseActivity;
 import com.kongzue.baseframework.BaseFragment;
+import com.kongzue.baseframework.interfaces.FragmentLayout;
 import com.kongzue.baseframework.interfaces.OnFragmentChangeListener;
 
 import java.util.ArrayList;
@@ -33,6 +38,9 @@ public class FragmentChangeUtil {
     private int exitAnimResId;
     
     private int frameLayoutResId;
+    private View containerView;
+    
+    private FragmentPagerAdapter fragmentPagerAdapter;
     
     public FragmentChangeUtil(BaseActivity me, int frameLayoutResId) {
         build(me, frameLayoutResId);
@@ -41,10 +49,15 @@ public FragmentChangeUtil(BaseActivity me, int frameLayoutResId) {
     public FragmentChangeUtil build(BaseActivity me, int frameLayoutResId) {
         this.me = me;
         this.frameLayoutResId = frameLayoutResId;
+        containerView = me.findViewById(frameLayoutResId);
         fragmentList = new ArrayList<>();
         return this;
     }
     
+    public FragmentPagerAdapter getFragmentPagerAdapter() {
+        return fragmentPagerAdapter;
+    }
+    
     public FragmentChangeUtil addFragment(BaseFragment fragment) {
         addFragment(fragment, true);
         return this;
@@ -56,11 +69,46 @@ public FragmentChangeUtil addFragment(BaseFragment fragment, boolean isPreload)
             return null;
         }
         if (isPreload) {
-            me.getSupportFragmentManager().beginTransaction().add(frameLayoutResId, fragment).commit();
-            me.getSupportFragmentManager().beginTransaction().hide(fragment).commit();
-            fragment.setAdded(true);
+            if (containerView instanceof FrameLayout) {
+                me.getSupportFragmentManager().beginTransaction().add(frameLayoutResId, fragment).commit();
+                me.getSupportFragmentManager().beginTransaction().hide(fragment).commit();
+                fragment.setAdded(true);
+            }
         }
         fragmentList.add(fragment);
+        if (containerView instanceof ViewPager) {
+            ViewPager viewPager = (ViewPager) containerView;
+            if (fragmentPagerAdapter == null) {
+                focusFragment = fragmentList.get(0);
+                fragmentPagerAdapter = new DefaultViewPagerAdapter(me.getSupportFragmentManager(), fragmentList);
+                viewPager.setAdapter(fragmentPagerAdapter);
+            } else {
+                fragmentPagerAdapter.notifyDataSetChanged();
+            }
+            viewPager.setOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+                @Override
+                public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+                
+                }
+                
+                @Override
+                public void onPageSelected(int position) {
+                    if (focusFragment != null) {
+                        focusFragment.onHide();
+                    }
+                    if (onFragmentChangeListener != null) {
+                        onFragmentChangeListener.onChange(position, fragmentList.get(position));
+                    }
+                    fragmentList.get(position).callShow();
+                    focusFragment = fragmentList.get(position);
+                }
+                
+                @Override
+                public void onPageScrollStateChanged(int state) {
+                
+                }
+            });
+        }
         return this;
     }
     
@@ -73,30 +121,40 @@ public FragmentChangeUtil show(BaseFragment fragment) {
             log("错误：请先执行 addFragment(fragment) 方法将此 Fragment 添加进 FragmentChangeUtil");
             return null;
         }
-        FragmentTransaction transaction = me.getSupportFragmentManager().beginTransaction();
-        if (enterAnimResId != 0 && exitAnimResId != 0) {
-            transaction.setCustomAnimations(enterAnimResId, exitAnimResId);
-            enterAnimResId = 0;
-            exitAnimResId = 0;
-        }
-        
-        if (focusFragment != null) {
-            focusFragment.onHide();
-            transaction.hide(focusFragment);
+        if (containerView instanceof FrameLayout) {
+            FragmentTransaction transaction = me.getSupportFragmentManager().beginTransaction();
+            if (enterAnimResId != 0 && exitAnimResId != 0) {
+                transaction.setCustomAnimations(enterAnimResId, exitAnimResId);
+                enterAnimResId = 0;
+                exitAnimResId = 0;
+            }
+            
+            if (focusFragment != null) {
+                focusFragment.onHide();
+                transaction.hide(focusFragment);
+            }
+            
+            if (!fragment.isAddedCompat()) {
+                transaction.add(frameLayoutResId, fragment);
+            } else {
+                transaction.show(fragment);
+                if (onFragmentChangeListener != null) {
+                    onFragmentChangeListener.onChange(fragmentList.indexOf(fragment), fragment);
+                }
+            }
+            transaction.commit();
+            fragment.callShow();
+            focusFragment = fragment;
         }
-        
-        if (!fragment.isAddedCompat()) {
-            transaction.add(frameLayoutResId, fragment);
-        } else {
-            transaction.show(fragment);
-            if (onFragmentChangeListener != null) {
-                onFragmentChangeListener.onChange(fragmentList.indexOf(fragment), fragment);
+        if (containerView instanceof ViewPager) {
+            if (getFocusFragment() == fragment) {
+                if (onFragmentChangeListener != null || focusFragment == null) {
+                    onFragmentChangeListener.onChange(fragmentList.indexOf(fragment), fragment);
+                }
             }
+            ViewPager viewPager = (ViewPager) containerView;
+            viewPager.setCurrentItem(fragmentList.indexOf(fragment));
         }
-        
-        transaction.commit();
-        fragment.callShow();
-        focusFragment = fragment;
         return this;
     }
     
@@ -105,30 +163,41 @@ public FragmentChangeUtil show(int index) {
             log("错误：请先执行build(...)方法初始化FragmentChangeUtil");
             return null;
         }
-        FragmentTransaction transaction = me.getSupportFragmentManager().beginTransaction();
-        if (enterAnimResId != 0 && exitAnimResId != 0) {
-            transaction.setCustomAnimations(enterAnimResId, exitAnimResId);
-            enterAnimResId = 0;
-            exitAnimResId = 0;
-        }
-        
-        if (focusFragment != null) {
-            focusFragment.onHide();
-            transaction.hide(focusFragment);
+        if (containerView instanceof FrameLayout) {
+            FragmentTransaction transaction = me.getSupportFragmentManager().beginTransaction();
+            if (enterAnimResId != 0 && exitAnimResId != 0) {
+                transaction.setCustomAnimations(enterAnimResId, exitAnimResId);
+                enterAnimResId = 0;
+                exitAnimResId = 0;
+            }
+            
+            if (focusFragment != null) {
+                focusFragment.onHide();
+                transaction.hide(focusFragment);
+            }
+            
+            if (!fragmentList.get(index).isAddedCompat()) {
+                transaction.add(frameLayoutResId, fragmentList.get(index));
+            } else {
+                if (onFragmentChangeListener != null) {
+                    onFragmentChangeListener.onChange(index, fragmentList.get(index));
+                }
+                transaction.show(fragmentList.get(index));
+            }
+            
+            transaction.commit();
+            fragmentList.get(index).callShow();
+            focusFragment = fragmentList.get(index);
         }
-        
-        if (!fragmentList.get(index).isAddedCompat()) {
-            transaction.add(frameLayoutResId, fragmentList.get(index));
-        } else {
-            if (onFragmentChangeListener != null) {
-                onFragmentChangeListener.onChange(index, fragmentList.get(index));
+        if (containerView instanceof ViewPager) {
+            if (getFocusFragmentIndex() == index || focusFragment == null) {
+                if (onFragmentChangeListener != null) {
+                    onFragmentChangeListener.onChange(index, fragmentList.get(index));
+                }
             }
-            transaction.show(fragmentList.get(index));
+            ViewPager viewPager = (ViewPager) containerView;
+            viewPager.setCurrentItem(index);
         }
-        
-        transaction.commit();
-        fragmentList.get(index).callShow();
-        focusFragment = fragmentList.get(index);
         return this;
     }
     
@@ -137,20 +206,26 @@ public FragmentChangeUtil hide(int index) {
             log("错误：请先执行build(...)方法初始化FragmentChangeUtil");
             return null;
         }
-        FragmentTransaction transaction = me.getSupportFragmentManager().beginTransaction();
-        if (enterAnimResId != 0 && exitAnimResId != 0) {
-            transaction.setCustomAnimations(enterAnimResId, exitAnimResId);
-            enterAnimResId = 0;
-            exitAnimResId = 0;
+        if (containerView instanceof FrameLayout) {
+            FragmentTransaction transaction = me.getSupportFragmentManager().beginTransaction();
+            if (enterAnimResId != 0 && exitAnimResId != 0) {
+                transaction.setCustomAnimations(enterAnimResId, exitAnimResId);
+                enterAnimResId = 0;
+                exitAnimResId = 0;
+            }
+            
+            if (!fragmentList.get(index).isAddedCompat()) {
+                transaction.add(frameLayoutResId, fragmentList.get(index));
+            }
+            fragmentList.get(index).onHide();
+            transaction.hide(fragmentList.get(index));
+            
+            transaction.commit();
         }
-        
-        if (!fragmentList.get(index).isAddedCompat()) {
-            transaction.add(frameLayoutResId, fragmentList.get(index));
+        if (containerView instanceof ViewPager) {
+            ViewPager viewPager = (ViewPager) containerView;
+            viewPager.setCurrentItem(0);
         }
-        fragmentList.get(index).onHide();
-        transaction.hide(fragmentList.get(index));
-        
-        transaction.commit();
         return this;
     }
     
@@ -159,17 +234,23 @@ public FragmentChangeUtil hideNow() {
             log("错误：请先执行build(...)方法初始化FragmentChangeUtil");
             return null;
         }
-        FragmentTransaction transaction = me.getSupportFragmentManager().beginTransaction();
-        if (enterAnimResId != 0 && exitAnimResId != 0) {
-            transaction.setCustomAnimations(enterAnimResId, exitAnimResId);
-            enterAnimResId = 0;
-            exitAnimResId = 0;
-        }
-        
-        focusFragment.onHide();
-        transaction.hide(focusFragment);
-        
-        transaction.commit();
+        if (containerView instanceof FrameLayout) {
+            FragmentTransaction transaction = me.getSupportFragmentManager().beginTransaction();
+            if (enterAnimResId != 0 && exitAnimResId != 0) {
+                transaction.setCustomAnimations(enterAnimResId, exitAnimResId);
+                enterAnimResId = 0;
+                exitAnimResId = 0;
+            }
+            
+            focusFragment.onHide();
+            transaction.hide(focusFragment);
+            
+            transaction.commit();
+        }
+        if (containerView instanceof ViewPager) {
+            ViewPager viewPager = (ViewPager) containerView;
+            viewPager.setCurrentItem(0);
+        }
         return this;
     }
     
@@ -178,20 +259,26 @@ public FragmentChangeUtil hide(BaseFragment fragment) {
             log("错误：请先执行build(...)方法初始化FragmentChangeUtil");
             return null;
         }
-        FragmentTransaction transaction = me.getSupportFragmentManager().beginTransaction();
-        if (enterAnimResId != 0 && exitAnimResId != 0) {
-            transaction.setCustomAnimations(enterAnimResId, exitAnimResId);
-            enterAnimResId = 0;
-            exitAnimResId = 0;
+        if (containerView instanceof FrameLayout) {
+            FragmentTransaction transaction = me.getSupportFragmentManager().beginTransaction();
+            if (enterAnimResId != 0 && exitAnimResId != 0) {
+                transaction.setCustomAnimations(enterAnimResId, exitAnimResId);
+                enterAnimResId = 0;
+                exitAnimResId = 0;
+            }
+            
+            if (!fragment.isAddedCompat()) {
+                transaction.add(frameLayoutResId, fragment);
+            }
+            fragment.onHide();
+            transaction.hide(fragment);
+            
+            transaction.commit();
         }
-        
-        if (!fragment.isAddedCompat()) {
-            transaction.add(frameLayoutResId, fragment);
+        if (containerView instanceof ViewPager) {
+            ViewPager viewPager = (ViewPager) containerView;
+            viewPager.setCurrentItem(0);
         }
-        fragment.onHide();
-        transaction.hide(fragment);
-        
-        transaction.commit();
         return this;
     }
     
@@ -200,20 +287,26 @@ public FragmentChangeUtil remove(BaseFragment fragment) {
             log("错误：请先执行build(...)方法初始化FragmentChangeUtil");
             return null;
         }
-        FragmentTransaction transaction = me.getSupportFragmentManager().beginTransaction();
-        if (enterAnimResId != 0 && exitAnimResId != 0) {
-            transaction.setCustomAnimations(enterAnimResId, exitAnimResId);
-            enterAnimResId = 0;
-            exitAnimResId = 0;
+        if (containerView instanceof FrameLayout) {
+            FragmentTransaction transaction = me.getSupportFragmentManager().beginTransaction();
+            if (enterAnimResId != 0 && exitAnimResId != 0) {
+                transaction.setCustomAnimations(enterAnimResId, exitAnimResId);
+                enterAnimResId = 0;
+                exitAnimResId = 0;
+            }
+            
+            if (fragment.isAddedCompat()) {
+                transaction.remove(fragment);
+            }
+            fragment.setAdded(false);
+            fragmentList.remove(fragment);
+            
+            transaction.commit();
         }
-        
-        if (fragment.isAddedCompat()) {
-            transaction.remove(fragment);
+        if (containerView instanceof ViewPager) {
+            fragmentList.remove(fragment);
+            fragmentPagerAdapter.notifyDataSetChanged();
         }
-        fragment.setAdded(false);
-        fragmentList.remove(fragment);
-        
-        transaction.commit();
         return this;
     }
     
@@ -264,6 +357,19 @@ public BaseFragment getFragment(int index) {
         return fragmentList.get(index);
     }
     
+    public BaseFragment getFragment(String instanceKey) {
+        if (me == null || frameLayoutResId == 0 || fragmentList == null) {
+            log("错误：请先执行build(...)方法初始化FragmentChangeUtil");
+            return null;
+        }
+        for (BaseFragment fragment : fragmentList) {
+            if (fragment.getInstanceKey().equals(instanceKey)) {
+                return fragment;
+            }
+        }
+        return null;
+    }
+    
     public BaseFragment getFragment(Class c) {
         if (me == null || frameLayoutResId == 0 || fragmentList == null) {
             log("错误：请先执行build(...)方法初始化FragmentChangeUtil");

From cfa1378d41551b62a26013806e5dabf6261a6d91 Mon Sep 17 00:00:00 2001
From: kongzue <myzcxhh@live.cn>
Date: Thu, 31 Dec 2020 16:08:12 +0800
Subject: [PATCH 15/18] 6.7.8 pub

---
 .idea/caches/build_file_checksums.ser         | Bin 592 -> 592 bytes
 .../baseframeworkdemo/MainActivity.java       |   1 +
 .../{ => activity}/AdapterTestActivity.java   |   4 ++-
 .../activity/TransitionActivity.java          |   1 -
 .../fragment/FunctionFragment.java            |   2 +-
 baseframework/build.gradle                    |  10 ++++----
 .../kongzue/baseframework/BaseActivity.java   |  24 ++++++++++--------
 .../util/FragmentChangeUtil.java              |  19 ++++++++++++--
 8 files changed, 41 insertions(+), 20 deletions(-)
 rename app/src/main/java/com/kongzue/baseframeworkdemo/{ => activity}/AdapterTestActivity.java (98%)

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 3264b133427d6e0033186208a945f3edfe77b3b6..633999517994942a66471aafad5c53d751197618 100644
GIT binary patch
delta 36
ucmV+<0Nel21kePKm;|@e#X_;1bpa4Tt589`F58mqUf4Fhf5bqOAp$QuMi7et

delta 36
scmcb>a)D*S43@BjZ@C-ilrjn&>Tx}OvN!PEK_|_2CB8$VlNFit0WgmbPXGV_

diff --git a/app/src/main/java/com/kongzue/baseframeworkdemo/MainActivity.java b/app/src/main/java/com/kongzue/baseframeworkdemo/MainActivity.java
index e78c64e..bc4ae24 100644
--- a/app/src/main/java/com/kongzue/baseframeworkdemo/MainActivity.java
+++ b/app/src/main/java/com/kongzue/baseframeworkdemo/MainActivity.java
@@ -28,6 +28,7 @@
 import com.kongzue.baseframework.util.OnPermissionResponseListener;
 import com.kongzue.baseframework.util.OnJumpResponseListener;
 import com.kongzue.baseframework.util.JumpParameter;
+import com.kongzue.baseframeworkdemo.activity.AdapterTestActivity;
 
 import java.io.File;
 import java.util.Locale;
diff --git a/app/src/main/java/com/kongzue/baseframeworkdemo/AdapterTestActivity.java b/app/src/main/java/com/kongzue/baseframeworkdemo/activity/AdapterTestActivity.java
similarity index 98%
rename from app/src/main/java/com/kongzue/baseframeworkdemo/AdapterTestActivity.java
rename to app/src/main/java/com/kongzue/baseframeworkdemo/activity/AdapterTestActivity.java
index b1e6e9d..511ef4e 100644
--- a/app/src/main/java/com/kongzue/baseframeworkdemo/AdapterTestActivity.java
+++ b/app/src/main/java/com/kongzue/baseframeworkdemo/activity/AdapterTestActivity.java
@@ -1,4 +1,4 @@
-package com.kongzue.baseframeworkdemo;
+package com.kongzue.baseframeworkdemo.activity;
 
 import androidx.appcompat.app.AppCompatActivity;
 
@@ -17,12 +17,14 @@
 import com.kongzue.baseframework.interfaces.SimpleMapAdapterSettings;
 import com.kongzue.baseframework.interfaces.SwipeBack;
 import com.kongzue.baseframework.util.JumpParameter;
+import com.kongzue.baseframeworkdemo.R;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+@Layout(R.layout.activity_adapter_test)
 public class AdapterTestActivity extends BaseActivity {
     
     private TextView txtTitle;
diff --git a/app/src/main/java/com/kongzue/baseframeworkdemo/activity/TransitionActivity.java b/app/src/main/java/com/kongzue/baseframeworkdemo/activity/TransitionActivity.java
index 71aeae0..865f2ff 100644
--- a/app/src/main/java/com/kongzue/baseframeworkdemo/activity/TransitionActivity.java
+++ b/app/src/main/java/com/kongzue/baseframeworkdemo/activity/TransitionActivity.java
@@ -11,7 +11,6 @@
 import com.kongzue.baseframeworkdemo.R;
 
 @Layout(R.layout.activity_transition)
-@SwipeBack(true)
 @NavigationBarBackgroundColorRes(R.color.colorPrimary)
 public class TransitionActivity extends BaseActivity {
     
diff --git a/app/src/main/java/com/kongzue/baseframeworkdemo/fragment/FunctionFragment.java b/app/src/main/java/com/kongzue/baseframeworkdemo/fragment/FunctionFragment.java
index 8ffcddf..59efaf8 100644
--- a/app/src/main/java/com/kongzue/baseframeworkdemo/fragment/FunctionFragment.java
+++ b/app/src/main/java/com/kongzue/baseframeworkdemo/fragment/FunctionFragment.java
@@ -17,7 +17,7 @@
 import com.kongzue.baseframework.util.JumpParameter;
 import com.kongzue.baseframework.util.OnJumpResponseListener;
 import com.kongzue.baseframework.util.OnPermissionResponseListener;
-import com.kongzue.baseframeworkdemo.AdapterTestActivity;
+import com.kongzue.baseframeworkdemo.activity.AdapterTestActivity;
 import com.kongzue.baseframeworkdemo.activity.DemoActivity;
 import com.kongzue.baseframeworkdemo.activity.JumpActivity;
 import com.kongzue.baseframeworkdemo.R;
diff --git a/baseframework/build.gradle b/baseframework/build.gradle
index c67e8ef..9546b93 100644
--- a/baseframework/build.gradle
+++ b/baseframework/build.gradle
@@ -6,16 +6,16 @@ def siteUrl = 'https://github.com/kongzue/BaseFramework' //项目在github主页
 def gitUrl = 'https://github.com/kongzue/BaseFramework.git'   //Git仓库的地址
 
 group = "com.kongzue.baseframeworkx"//发布aar前缀根节点
-version = "6.7.7.6"//发布aar的库版本
+version = "6.7.8"//发布aar的库版本
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 29
-        versionCode 116
-        versionName "6.7.7.6"
+        targetSdkVersion 30
+        versionCode 118
+        versionName "6.7.8"
     }
 
     buildTypes {
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java b/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java
index 386b308..1c38dd9 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java
@@ -97,7 +97,7 @@
 import static com.kongzue.baseframework.BaseFrameworkSettings.setNavigationBarHeightZero;
 
 /**
- * @Version: 6.7.0
+ * @Version: 6.7.8
  * @Author: Kongzue
  * @github: https://github.com/kongzue/BaseFramework
  * @link: http://kongzue.com/
@@ -135,7 +135,11 @@ protected void onCreate(Bundle savedInstanceState) {
         if (BaseApp.getPrivateInstance() == null) {
             BaseApp.setPrivateInstance(getApplication());
         }
-        mHelper = new SwipeBackActivityHelper(this);
+        SwipeBack swipeBack = getClass().getAnnotation(SwipeBack.class);
+        if (swipeBack != null) {
+            enableSwipeBack = swipeBack.value();
+        }
+        if (enableSwipeBack) mHelper = new SwipeBackActivityHelper(this);
         this.savedInstanceState = savedInstanceState;
         
         logG("\n" + me.getClass().getSimpleName(), "onCreate");
@@ -327,11 +331,12 @@ public void setLifeCircleListener(LifeCircleListener lifeCircleListener) {
         this.lifeCircleListener = lifeCircleListener;
     }
     
+    protected boolean enableSwipeBack;
+    
     //加载注解设置
     private void initAttributes() {
         try {
             FullScreen fullScreen = getClass().getAnnotation(FullScreen.class);
-            SwipeBack swipeBack = getClass().getAnnotation(SwipeBack.class);
             Layout layout = getClass().getAnnotation(Layout.class);
             FragmentLayout fragmentLayout = getClass().getAnnotation(FragmentLayout.class);
             DarkNavigationBarTheme darkNavigationBarTheme = getClass().getAnnotation(DarkNavigationBarTheme.class);
@@ -346,11 +351,10 @@ private void initAttributes() {
                     requestWindowFeature(Window.FEATURE_NO_TITLE);
                 }
             }
-            mHelper.onActivityCreate();
-            if (swipeBack != null) {
-                setSwipeBackEnable(swipeBack.value());
-            } else {
-                setSwipeBackEnable(false);
+            
+            if (enableSwipeBack) {
+                mHelper.onActivityCreate();
+                setSwipeBackEnable(enableSwipeBack);
             }
             if (layout != null) {
                 if (layout.value() != -1) {
@@ -1585,12 +1589,12 @@ public void restartMe() {
     @Override
     protected void onPostCreate(Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);
-        mHelper.onPostCreate();
+        if (enableSwipeBack) mHelper.onPostCreate();
     }
     
     @Override
     public SwipeBackLayout getSwipeBackLayout() {
-        return mHelper.getSwipeBackLayout();
+        return enableSwipeBack ? mHelper.getSwipeBackLayout() : null;
     }
     
     @Override
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/FragmentChangeUtil.java b/baseframework/src/main/java/com/kongzue/baseframework/util/FragmentChangeUtil.java
index e880210..e78870a 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/util/FragmentChangeUtil.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/util/FragmentChangeUtil.java
@@ -113,6 +113,11 @@ public void onPageScrollStateChanged(int state) {
     }
     
     public FragmentChangeUtil show(BaseFragment fragment) {
+        show(fragment, true);
+        return this;
+    }
+    
+    public FragmentChangeUtil show(BaseFragment fragment, boolean autoHideOldFragment) {
         if (me == null || frameLayoutResId == 0 || fragmentList == null) {
             log("错误：请先执行build(...)方法初始化FragmentChangeUtil");
             return null;
@@ -129,7 +134,7 @@ public FragmentChangeUtil show(BaseFragment fragment) {
                 exitAnimResId = 0;
             }
             
-            if (focusFragment != null) {
+            if (autoHideOldFragment && focusFragment != null) {
                 focusFragment.onHide();
                 transaction.hide(focusFragment);
             }
@@ -159,6 +164,11 @@ public FragmentChangeUtil show(BaseFragment fragment) {
     }
     
     public FragmentChangeUtil show(int index) {
+        show(index, true);
+        return this;
+    }
+    
+    public FragmentChangeUtil show(int index, boolean autoHideOldFragment) {
         if (me == null || frameLayoutResId == 0 || fragmentList == null) {
             log("错误：请先执行build(...)方法初始化FragmentChangeUtil");
             return null;
@@ -171,7 +181,7 @@ public FragmentChangeUtil show(int index) {
                 exitAnimResId = 0;
             }
             
-            if (focusFragment != null) {
+            if (autoHideOldFragment && focusFragment != null) {
                 focusFragment.onHide();
                 transaction.hide(focusFragment);
             }
@@ -322,6 +332,11 @@ public BaseFragment getFocusFragment() {
         return focusFragment;
     }
     
+    public FragmentChangeUtil setFocusFragment(BaseFragment fragment) {
+        focusFragment = fragment;
+        return this;
+    }
+    
     public int getFocusFragmentIndex() {
         if (fragmentList == null) {
             log("错误：请先执行build(...)方法初始化FragmentChangeUtil");

From a0013ef47c7906bbf7d93c2a346ce92ce4185f4a Mon Sep 17 00:00:00 2001
From: kongzue <myzcxhh@live.cn>
Date: Sat, 16 Jan 2021 07:17:59 +0800
Subject: [PATCH 16/18] 6.7.8.1 - add runOnResume function.

---
 .idea/caches/build_file_checksums.ser         | Bin 592 -> 592 bytes
 baseframework/build.gradle                    |   6 ++---
 .../kongzue/baseframework/BaseActivity.java   |  22 ++++++++++++++++++
 .../kongzue/baseframework/BaseFragment.java   |  22 ++++++++++++++++++
 4 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 633999517994942a66471aafad5c53d751197618..c2f7995ac55648898dc47cd4096d7f8c1a0e5087 100644
GIT binary patch
delta 37
tcmcb>a)D*Sbk=f?aJDlW=ae!EM18sBb^m*4@|KVJJP{g6Mw1np^Z_r{4`BcR

delta 37
vcmV+=0NVf11kePKmj!mW)5SuuoOJ;ZL90+fy)N65>|WS5y??|&lOX~xOYRW?

diff --git a/baseframework/build.gradle b/baseframework/build.gradle
index 9546b93..7a6e316 100644
--- a/baseframework/build.gradle
+++ b/baseframework/build.gradle
@@ -6,7 +6,7 @@ def siteUrl = 'https://github.com/kongzue/BaseFramework' //项目在github主页
 def gitUrl = 'https://github.com/kongzue/BaseFramework.git'   //Git仓库的地址
 
 group = "com.kongzue.baseframeworkx"//发布aar前缀根节点
-version = "6.7.8"//发布aar的库版本
+version = "6.7.8.1"//发布aar的库版本
 
 android {
     compileSdkVersion 30
@@ -14,8 +14,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 30
-        versionCode 118
-        versionName "6.7.8"
+        versionCode 119
+        versionName "6.7.8.1"
     }
 
     buildTypes {
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java b/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java
index 1c38dd9..2c22606 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java
@@ -1390,6 +1390,28 @@ protected void onResume() {
             globalLifeCircleListener.onResume(me, me.getClass().getName());
         }
         AppManager.setActiveActivity(this);
+        if (resumeRunnableList != null) {
+            for (Runnable runnable : resumeRunnableList) {
+                runOnMain(runnable);
+            }
+        }
+    }
+    
+    private List<Runnable> resumeRunnableList;
+    
+    public void runOnResume(Runnable resumeRunnable) {
+        if (resumeRunnableList == null) {
+            resumeRunnableList = new ArrayList<>();
+        }
+        resumeRunnableList.add(resumeRunnable);
+    }
+    
+    public void cleanResumeRunnable() {
+        resumeRunnableList = new ArrayList<>();
+    }
+    
+    public void deleteResumeRunnable(Runnable resumeRunnable) {
+        if (resumeRunnableList != null) resumeRunnableList.remove(resumeRunnable);
     }
     
     @Override
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java b/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java
index 02342a3..8455a49 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java
@@ -681,6 +681,28 @@ public void onResume() {
         if (lifeCircleListener != null) {
             lifeCircleListener.onResume();
         }
+        if (resumeRunnableList != null) {
+            for (Runnable runnable : resumeRunnableList) {
+                runOnMain(runnable);
+            }
+        }
+    }
+    
+    private List<Runnable> resumeRunnableList;
+    
+    public void runOnResume(Runnable resumeRunnable) {
+        if (resumeRunnableList == null) {
+            resumeRunnableList = new ArrayList<>();
+        }
+        resumeRunnableList.add(resumeRunnable);
+    }
+    
+    public void cleanResumeRunnable() {
+        resumeRunnableList = new ArrayList<>();
+    }
+    
+    public void deleteResumeRunnable(Runnable resumeRunnable) {
+        if (resumeRunnableList != null) resumeRunnableList.remove(resumeRunnable);
     }
     
     @Override

From d970d22fd2bef97304438a67972cb887022f1a9b Mon Sep 17 00:00:00 2001
From: kongzue <myzcxhh@live.cn>
Date: Wed, 3 Mar 2021 22:37:54 +0800
Subject: [PATCH 17/18] 6.7.9 update

---
 .idea/caches/build_file_checksums.ser         | Bin 592 -> 597 bytes
 .idea/codeStyles/Project.xml                  |  15 ++------
 .idea/jarRepositories.xml                     |  15 ++++++++
 .idea/misc.xml                                |  24 ++----------
 app/build.gradle                              |   8 ++--
 .../activity/DemoActivity.java                |   4 ++
 baseframework/build.gradle                    |   6 +--
 .../kongzue/baseframework/BaseActivity.java   |  36 ++++++++++++++++++
 .../kongzue/baseframework/BaseFragment.java   |   9 +++++
 .../interfaces/ActivityResultCallback.java    |  35 +++++++++++++++++
 .../baseframework/util/JumpParameter.java     |   1 -
 build.gradle                                  |   2 +-
 gradle/wrapper/gradle-wrapper.properties      |   4 +-
 13 files changed, 115 insertions(+), 44 deletions(-)
 create mode 100644 baseframework/src/main/java/com/kongzue/baseframework/interfaces/ActivityResultCallback.java

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index c2f7995ac55648898dc47cd4096d7f8c1a0e5087..ea40c778b2088e146a47f15d03fcf5ba2a9e003b 100644
GIT binary patch
delta 144
zcmV;B0B`@$1l0tPm<0HIg<_GMcMxY~Ttt*DEuRH%tXiDNJ-d@50WK6RLpoelb7gXK
zTx)M`XL@yIEqQB`i2)=KxN|E9UMmYY5eUxY2%xB>lTQH|5LA&iuPhJDrata)-oFwa
ycayyV9T1Q}!;w;=qR6t^)Rtrj#bT4{0Vfd4qES)3*B{K?iwco@V2LM_Ap$Q!={pnv

delta 156
zcmV;N0Av5v1kePKm;?w{2F#J1cMyJpO88bg3~7ldT5bCww%d~<0WJXyk^&YX0|BNu
z+RvqwuS*)XlE1JmbO0zrI$TwAWpZ;|ZFzcQc#~xTBp4ZEMSWM$>du&*3oDepQpa=v
z5NvN_VQiBx0u>O}4$~P6Zai0C;Q0~&bc$}1?*S(hTJ+LN-}hBxwDE5YSSVsLbN~^P
KZUGyUL;?}3%sgoT

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 0d15693..663459a 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -3,18 +3,9 @@
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
+          <package name="java.util" withSubpackages="false" static="false" />
+          <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
+          <package name="io.ktor" withSubpackages="true" static="false" />
         </value>
       </option>
     </JetCodeStyleSettings>
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 23a8e76..7746271 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -36,5 +36,20 @@
       <option name="name" value="D:\sdk\Android\extras\m2repository" />
       <option name="url" value="file:/D:/SDK/Android/extras/m2repository/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="D:\SDK\Android\extras\android\m2repository" />
+      <option name="name" value="D:\SDK\Android\extras\android\m2repository" />
+      <option name="url" value="file:/D:/SDK/Android/extras/android/m2repository" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="D:\SDK\Android\extras\google\m2repository" />
+      <option name="name" value="D:\SDK\Android\extras\google\m2repository" />
+      <option name="url" value="file:/D:/SDK/Android/extras/google/m2repository" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="D:\SDK\Android\extras\m2repository" />
+      <option name="name" value="D:\SDK\Android\extras\m2repository" />
+      <option name="url" value="file:/D:/SDK/Android/extras/m2repository" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index d026043..98badf0 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,45 +5,27 @@
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
     <option name="myNullables">
       <value>
-        <list size="14">
+        <list size="5">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
           <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
           <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
           <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
-          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
-          <item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
-          <item index="7" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
-          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
-          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
-          <item index="10" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
-          <item index="11" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.Nullable" />
-          <item index="12" class="java.lang.String" itemvalue="io.reactivex.annotations.Nullable" />
-          <item index="13" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.Nullable" />
         </list>
       </value>
     </option>
     <option name="myNotNulls">
       <value>
-        <list size="13">
+        <list size="4">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
-          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
-          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
-          <item index="6" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />
-          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
-          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
-          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
-          <item index="10" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.NonNull" />
-          <item index="11" class="java.lang.String" itemvalue="io.reactivex.annotations.NonNull" />
-          <item index="12" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.NonNull" />
         </list>
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8 (2)" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8 (2)" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index 7fa5451..b122969 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
     defaultConfig {
         applicationId "com.kongzue.baseframeworkdemo"
         minSdkVersion 15
-        targetSdkVersion 29
-        versionCode 110
-        versionName "6.7.5"
+        targetSdkVersion 30
+        versionCode 120
+        versionName "6.7.9"
     }
     buildTypes {
         release {
diff --git a/app/src/main/java/com/kongzue/baseframeworkdemo/activity/DemoActivity.java b/app/src/main/java/com/kongzue/baseframeworkdemo/activity/DemoActivity.java
index f072c5b..ef3831a 100644
--- a/app/src/main/java/com/kongzue/baseframeworkdemo/activity/DemoActivity.java
+++ b/app/src/main/java/com/kongzue/baseframeworkdemo/activity/DemoActivity.java
@@ -1,9 +1,13 @@
 package com.kongzue.baseframeworkdemo.activity;
 
+import android.content.Intent;
 import android.view.View;
 
+import androidx.annotation.Nullable;
+
 import com.kongzue.baseframework.BaseActivity;
 import com.kongzue.baseframework.BaseFragment;
+import com.kongzue.baseframework.interfaces.ActivityResultCallback;
 import com.kongzue.baseframework.interfaces.BindView;
 import com.kongzue.baseframework.interfaces.DarkNavigationBarTheme;
 import com.kongzue.baseframework.interfaces.DarkStatusBarTheme;
diff --git a/baseframework/build.gradle b/baseframework/build.gradle
index 7a6e316..a3c093f 100644
--- a/baseframework/build.gradle
+++ b/baseframework/build.gradle
@@ -6,7 +6,7 @@ def siteUrl = 'https://github.com/kongzue/BaseFramework' //项目在github主页
 def gitUrl = 'https://github.com/kongzue/BaseFramework.git'   //Git仓库的地址
 
 group = "com.kongzue.baseframeworkx"//发布aar前缀根节点
-version = "6.7.8.1"//发布aar的库版本
+version = "6.7.9"//发布aar的库版本
 
 android {
     compileSdkVersion 30
@@ -14,8 +14,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 30
-        versionCode 119
-        versionName "6.7.8.1"
+        versionCode 120
+        versionName "6.7.9"
     }
 
     buildTypes {
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java b/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java
index 2c22606..6546375 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java
@@ -44,6 +44,7 @@
 import android.widget.EditText;
 import android.widget.Toast;
 
+import com.kongzue.baseframework.interfaces.ActivityResultCallback;
 import com.kongzue.baseframework.interfaces.BindView;
 import com.kongzue.baseframework.interfaces.BindViews;
 import com.kongzue.baseframework.interfaces.FragmentLayout;
@@ -1701,4 +1702,39 @@ public void run() {
     public String getInstanceKey() {
         return getClass().getName() + "@" + Integer.toHexString(hashCode());
     }
+    
+    private List<ActivityResultCallback> activityResultCallbackList;
+    
+    public void startActivityForResult(Intent intent, ActivityResultCallback activityResultCallback) {
+        if (activityResultCallbackList == null) activityResultCallbackList = new ArrayList<>();
+        if (activityResultCallback.getResultId() == 0) {
+            activityResultCallback.setResultId(100000 + activityResultCallbackList.size());
+        }
+        activityResultCallbackList.add(activityResultCallback);
+        super.startActivityForResult(intent, activityResultCallback.getResultId());
+    }
+    
+    public void startActivityForResult(Intent intent, ActivityResultCallback activityResultCallback, @Nullable Bundle options) {
+        if (activityResultCallbackList == null) activityResultCallbackList = new ArrayList<>();
+        if (activityResultCallback.getResultId() == 0) {
+            activityResultCallback.setResultId(100 + activityResultCallbackList.size());
+        }
+        activityResultCallbackList.add(activityResultCallback);
+        super.startActivityForResult(intent, activityResultCallback.getResultId(), options);
+    }
+    
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (activityResultCallbackList != null) {
+            List<ActivityResultCallback> runActivityResultCallback = new ArrayList<>();
+            for (ActivityResultCallback callback : activityResultCallbackList) {
+                if (callback.getResultId() == requestCode) {
+                    callback.onActivityResult(requestCode, resultCode, data);
+                    runActivityResultCallback.add(callback);
+                }
+            }
+            activityResultCallbackList.removeAll(runActivityResultCallback);
+        }
+    }
 }
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java b/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java
index 8455a49..b5cbc03 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java
@@ -18,6 +18,7 @@
 import android.widget.EditText;
 import android.widget.Toast;
 
+import com.kongzue.baseframework.interfaces.ActivityResultCallback;
 import com.kongzue.baseframework.interfaces.BindView;
 import com.kongzue.baseframework.interfaces.BindViews;
 import com.kongzue.baseframework.interfaces.LifeCircleListener;
@@ -849,4 +850,12 @@ public boolean onBack() {
     public String getInstanceKey() {
         return getClass().getName() + "@" + Integer.toHexString(hashCode());
     }
+    
+    public void startActivityForResult(Intent intent, ActivityResultCallback activityResultCallback) {
+        me.startActivityForResult(intent, activityResultCallback);
+    }
+    
+    public void startActivityForResult(Intent intent, ActivityResultCallback activityResultCallback, @Nullable Bundle options) {
+        me.startActivityForResult(intent, activityResultCallback, options);
+    }
 }
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/interfaces/ActivityResultCallback.java b/baseframework/src/main/java/com/kongzue/baseframework/interfaces/ActivityResultCallback.java
new file mode 100644
index 0000000..fc13292
--- /dev/null
+++ b/baseframework/src/main/java/com/kongzue/baseframework/interfaces/ActivityResultCallback.java
@@ -0,0 +1,35 @@
+package com.kongzue.baseframework.interfaces;
+
+import android.content.Intent;
+
+import androidx.annotation.Nullable;
+
+/**
+ * @author: Kongzue
+ * @github: https://github.com/kongzue/
+ * @homepage: http://kongzue.com/
+ * @mail: myzcxhh@live.cn
+ * @createTime: 2021/1/19 15:06
+ */
+public abstract class ActivityResultCallback {
+    
+    public ActivityResultCallback(int resultId) {
+        this.resultId = resultId;
+    }
+    
+    public ActivityResultCallback() {
+    }
+    
+    public int resultId;
+    
+    public int getResultId() {
+        return resultId;
+    }
+    
+    public ActivityResultCallback setResultId(int resultId) {
+        this.resultId = resultId;
+        return this;
+    }
+    
+    public abstract void onActivityResult(int requestCode, int resultCode, @Nullable Intent data);
+}
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/JumpParameter.java b/baseframework/src/main/java/com/kongzue/baseframework/util/JumpParameter.java
index 0215c03..09a8255 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/util/JumpParameter.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/util/JumpParameter.java
@@ -8,7 +8,6 @@
  * @Author: Kongzue
  * @github: https://github.com/kongzue/BaseFramework
  * @link: http://kongzue.com/
- * @describe: 自动化代码流水线作业，以及对原生安卓、MIUI、flyme的透明状态栏显示灰色图标文字的支持，同时提供一些小工具简化开发难度，详细说明文档：https://github.com/kongzue/BaseFramework
  */
 
 public class JumpParameter {
diff --git a/build.gradle b/build.gradle
index 094aa6d..2d962a6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.android.tools.build:gradle:4.1.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4dca3db..fa43fa6 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Jul 11 20:28:36 CST 2019
+#Tue Jan 19 15:03:25 CST 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip

From b23ef1ce983560253ce403472925689ced3ec8f0 Mon Sep 17 00:00:00 2001
From: kongzue <myzcxhh@live.cn>
Date: Mon, 19 Apr 2021 17:01:38 +0800
Subject: [PATCH 18/18] 6.7.9.3

---
 .idea/caches/build_file_checksums.ser         | Bin 597 -> 592 bytes
 .idea/misc.xml                                |  24 +-
 .../com/kongzue/baseframeworkdemo/App.java    |   5 +
 .../baseframeworkdemo/FragmentDemo.java       |  82 ----
 .../baseframeworkdemo/JumpActivity.java       |  50 ---
 .../baseframeworkdemo/MainActivity.java       | 362 ------------------
 .../baseframeworkdemo/ResponseActivity.java   |  55 ---
 .../baseframeworkdemo/TransitionActivity.java |  38 --
 .../activity/DemoActivity.java                |   6 +-
 .../activity/JumpActivity.java                |   1 -
 baseframework/build.gradle                    |   4 +-
 .../kongzue/baseframework/BaseActivity.java   |  15 +-
 .../kongzue/baseframework/BaseFragment.java   |  82 ++--
 .../baseframework/BaseFrameworkSettings.java  |   3 +
 .../kongzue/baseframework/util/DebugLogG.java |  58 ++-
 .../baseframework/util/JsonFormat.java        |   7 +-
 16 files changed, 160 insertions(+), 632 deletions(-)
 delete mode 100644 app/src/main/java/com/kongzue/baseframeworkdemo/FragmentDemo.java
 delete mode 100644 app/src/main/java/com/kongzue/baseframeworkdemo/JumpActivity.java
 delete mode 100644 app/src/main/java/com/kongzue/baseframeworkdemo/MainActivity.java
 delete mode 100644 app/src/main/java/com/kongzue/baseframeworkdemo/ResponseActivity.java
 delete mode 100644 app/src/main/java/com/kongzue/baseframeworkdemo/TransitionActivity.java

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index ea40c778b2088e146a47f15d03fcf5ba2a9e003b..eb780e76609cd678cb25acbcc3dd75ae3ddad957 100644
GIT binary patch
delta 122
zcmV-=0EPe61kePKmj!s~PlDQ!oV5WAk^&Z!vH=ngC__42RdZ!>b6jnCdSiH#WdS4@
zwFi&s7Fy<FvuQRPK^mG<bN~=+Z)0I>lP>}l5Y`UU84GSaS6|@y5&(3HZj<i;Clglr
c<0^>qc-(x!EXXGS%NKM25tD8K8<Ru=5kBND9RL6T

delta 107
zcmV-x0F?jG1l0tPmj!qDe1&3>oV64!Lpoelb7gXKTx)M`XL@yIEqQB`i2)=KxN|E9
zUMmYY5eUxY2%xB>lTQIFlfMBQ5RgE_ky4_f$g<khmShOUVw36tClJe`QBl3uAI#m0
N3XywYi6@gG0xw3gEU*9o

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 98badf0..d026043 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,27 +5,45 @@
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
     <option name="myNullables">
       <value>
-        <list size="5">
+        <list size="14">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
           <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
           <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
           <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
+          <item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
+          <item index="7" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
+          <item index="10" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
+          <item index="11" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.Nullable" />
+          <item index="12" class="java.lang.String" itemvalue="io.reactivex.annotations.Nullable" />
+          <item index="13" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.Nullable" />
         </list>
       </value>
     </option>
     <option name="myNotNulls">
       <value>
-        <list size="4">
+        <list size="13">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
+          <item index="6" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />
+          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
+          <item index="10" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.NonNull" />
+          <item index="11" class="java.lang.String" itemvalue="io.reactivex.annotations.NonNull" />
+          <item index="12" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.NonNull" />
         </list>
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8 (2)" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8 (2)" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/java/com/kongzue/baseframeworkdemo/App.java b/app/src/main/java/com/kongzue/baseframeworkdemo/App.java
index a1acb38..08450bc 100644
--- a/app/src/main/java/com/kongzue/baseframeworkdemo/App.java
+++ b/app/src/main/java/com/kongzue/baseframeworkdemo/App.java
@@ -60,6 +60,11 @@ public void onClick(DialogInterface dialog, int which) {
                 return false;
             }
         });
+        
+        int[] a = {1, 3, 5, 7, 9};
+        log(a);
+        CharSequence[] s = {"s", "b", "t", "m"};
+        log(s);
     }
     
     @Override
diff --git a/app/src/main/java/com/kongzue/baseframeworkdemo/FragmentDemo.java b/app/src/main/java/com/kongzue/baseframeworkdemo/FragmentDemo.java
deleted file mode 100644
index 017378f..0000000
--- a/app/src/main/java/com/kongzue/baseframeworkdemo/FragmentDemo.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.kongzue.baseframeworkdemo;
-
-import android.annotation.SuppressLint;
-import android.content.res.Configuration;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.TextView;
-
-import com.kongzue.baseframework.BaseFragment;
-import com.kongzue.baseframework.interfaces.Layout;
-import com.kongzue.baseframework.util.JumpParameter;
-
-@Layout(R.layout.fragment_demo)
-public class FragmentDemo extends BaseFragment<MainActivity> {
-    
-    private int index;
-    
-    private TextView txtTitle;
-    private TextView info;
-    private Button btnHide;
-    
-    public FragmentDemo() {
-    }
-    
-    @SuppressLint("ValidFragment")
-    public FragmentDemo(int index) {
-        this.index = index;
-    }
-    
-    @Override
-    public void initViews() {
-        //此处加载组件
-        log("fragment " + index + " : initViews");
-        txtTitle = findViewById(R.id.txt_title);
-        info = findViewById(R.id.info);
-        btnHide = findViewById(R.id.btn_hide);
-    }
-    
-    @Override
-    public void initDatas() {
-        //此处编写初始化代码
-        txtTitle.setText("BaseFragment " + index);
-        log("fragment " + index + " : initDatas");
-    }
-    
-    @Override
-    public void setEvents() {
-        //此处为组件绑定事件
-        log("fragment " + index + " : setEvents");
-        btnHide.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                //int changeTo = index;
-                //if (changeTo > 2) changeTo = 0;
-                //log("fragment " + index + " : 切换到：" + (changeTo + 1));
-                //me.fragmentChangeUtil.show(changeTo);
-                me.fragmentChangeUtil.hideNow();
-            }
-        });
-    }
-    
-    @Override
-    public void onLoad() {
-        //首次显示时执行
-        log("fragment " + index + " : onLoad");
-    }
-    
-    @Override
-    public void onResume() {
-        super.onResume();
-        log("fragment " + index + " : onResume");
-    }
-    
-    @Override
-    public void onShow(boolean isSwitchFragment) {
-        log("fragment " + index + " : onShow");
-    }
-}
diff --git a/app/src/main/java/com/kongzue/baseframeworkdemo/JumpActivity.java b/app/src/main/java/com/kongzue/baseframeworkdemo/JumpActivity.java
deleted file mode 100644
index c343400..0000000
--- a/app/src/main/java/com/kongzue/baseframeworkdemo/JumpActivity.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.kongzue.baseframeworkdemo;
-
-import android.graphics.Bitmap;
-import androidx.appcompat.app.AppCompatActivity;
-
-import android.view.View;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.kongzue.baseframework.BaseActivity;
-import com.kongzue.baseframework.interfaces.Layout;
-import com.kongzue.baseframework.interfaces.SwipeBack;
-import com.kongzue.baseframework.util.JumpParameter;
-
-@Layout(R.layout.activity_jump)
-@SwipeBack(true)
-public class JumpActivity extends BaseActivity {
-
-    private TextView txtP1;
-    private ImageView imgP2;
-    private Button btnClose;
-
-    @Override
-    public void initViews() {
-        txtP1 = findViewById(R.id.txt_p1);
-        imgP2 = findViewById(R.id.img_p2);
-        btnClose = findViewById(R.id.btn_close);
-    }
-
-    @Override
-    public void initDatas(JumpParameter parameter) {
-        String parameter1 = (String) getParameter().get("参数1");
-        if (!isNull(parameter1)) txtP1.setText("第一个参数读取到的值为：" + parameter1);
-
-        Bitmap parameter2 = (Bitmap) getParameter().get("参数2");
-        if (parameter2 != null) imgP2.setImageBitmap(parameter2);
-    }
-
-    @Override
-    public void setEvents() {
-        btnClose.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                finish();
-            }
-        });
-    }
-
-}
diff --git a/app/src/main/java/com/kongzue/baseframeworkdemo/MainActivity.java b/app/src/main/java/com/kongzue/baseframeworkdemo/MainActivity.java
deleted file mode 100644
index bc4ae24..0000000
--- a/app/src/main/java/com/kongzue/baseframeworkdemo/MainActivity.java
+++ /dev/null
@@ -1,362 +0,0 @@
-package com.kongzue.baseframeworkdemo;
-
-import android.Manifest;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.net.Uri;
-
-import androidx.appcompat.app.AlertDialog;
-
-import android.view.View;
-import android.widget.Button;
-import android.widget.FrameLayout;
-import android.widget.TextView;
-
-import com.kongzue.baseframework.BaseActivity;
-import com.kongzue.baseframework.BaseFrameworkSettings;
-import com.kongzue.baseframework.interfaces.LifeCircleListener;
-import com.kongzue.baseframework.interfaces.DarkNavigationBarTheme;
-import com.kongzue.baseframework.interfaces.DarkStatusBarTheme;
-import com.kongzue.baseframework.interfaces.Layout;
-import com.kongzue.baseframework.interfaces.NavigationBarBackgroundColor;
-import com.kongzue.baseframework.interfaces.OnBugReportListener;
-import com.kongzue.baseframework.util.FragmentChangeUtil;
-import com.kongzue.baseframework.util.OnPermissionResponseListener;
-import com.kongzue.baseframework.util.OnJumpResponseListener;
-import com.kongzue.baseframework.util.JumpParameter;
-import com.kongzue.baseframeworkdemo.activity.AdapterTestActivity;
-
-import java.io.File;
-import java.util.Locale;
-
-@Layout(R.layout.activity_main)
-@DarkStatusBarTheme(false)
-@NavigationBarBackgroundColor(a = 255, r = 255, g = 255, b = 255)
-@DarkNavigationBarTheme(true)
-public class MainActivity extends BaseActivity {
-    
-    private FragmentDemo fragmentDemo = new FragmentDemo(1);
-    private FragmentDemo fragmentDemo2 = new FragmentDemo(2);
-    private FragmentDemo fragmentDemo3 = new FragmentDemo(3);
-    public FragmentChangeUtil fragmentChangeUtil;
-    
-    private TextView txtTitle;
-    private TextView linkHome;
-    private Button intentToFragment;
-    private Button intentToBaseAdapter;
-    private Button btnJump;
-    private Button btnResult;
-    private Button btnTransition;
-    private Button btnPermission;
-    private Button btnError;
-    private Button btnPrintJsonLog;
-    private Button btnGetImei;
-    private Button btnChangeLng;
-    private Button btnToast;
-    private TextView linkBokhttp;
-    private TextView linkBvolley;
-    private TextView linkUpdate;
-    private TextView linkDialog;
-    private FrameLayout frame;
-    
-    @Override
-    public void initViews() {
-        //此处加载组件
-        txtTitle = findViewById(R.id.txt_title);
-        linkHome = findViewById(R.id.link_home);
-        intentToFragment = findViewById(R.id.intentToFragment);
-        intentToBaseAdapter = findViewById(R.id.intentToBaseAdapter);
-        btnJump = findViewById(R.id.btn_jump);
-        btnResult = findViewById(R.id.btn_result);
-        btnTransition = findViewById(R.id.btn_transition);
-        btnPermission = findViewById(R.id.btn_permission);
-        btnError = findViewById(R.id.btn_error);
-        btnPrintJsonLog = findViewById(R.id.btn_printJsonLog);
-        btnGetImei = findViewById(R.id.btn_getImei);
-        btnChangeLng = findViewById(R.id.btn_changeLng);
-        btnToast = findViewById(R.id.btn_toast);
-        linkBokhttp = findViewById(R.id.link_bokhttp);
-        linkBvolley = findViewById(R.id.link_bvolley);
-        linkUpdate = findViewById(R.id.link_update);
-        linkDialog = findViewById(R.id.link_dialog);
-        frame = findViewById(R.id.frame);
-    }
-    
-    @Override
-    public void initDatas(JumpParameter parameter) {
-        BaseFrameworkSettings.turnOnReadErrorInfoPermissions(this, new OnBugReportListener() {
-            
-            @Override
-            public boolean onCrash(Exception e, final File crashLogFile) {
-                log(crashLogFile.getAbsolutePath());
-                runOnMain(new Runnable() {
-                    @Override
-                    public void run() {
-                        AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
-                        builder.setTitle("Ops！发生了一次崩溃！");
-                        builder.setMessage("您是否愿意帮助我们改进程序以修复此Bug？");
-                        builder.setPositiveButton("愿意", new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialog, int which) {
-                                toast("请对file进行处理：" + crashLogFile.getAbsolutePath());
-                            }
-                        });
-                        builder.setNegativeButton("不了", new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialog, int which) {
-                    
-                            }
-                        });
-                        AlertDialog dialog = builder.create();
-                        dialog.show();
-                    }
-                });
-                return false;
-            }
-        });
-        
-        log(Color.rgb(70, 155, 223));
-        //此处编写初始化代码
-        linkHome.getPaint().setFlags(Paint.UNDERLINE_TEXT_FLAG);
-        linkBokhttp.getPaint().setFlags(Paint.UNDERLINE_TEXT_FLAG);
-        linkBvolley.getPaint().setFlags(Paint.UNDERLINE_TEXT_FLAG);
-        linkUpdate.getPaint().setFlags(Paint.UNDERLINE_TEXT_FLAG);
-        linkDialog.getPaint().setFlags(Paint.UNDERLINE_TEXT_FLAG);
-        
-        fragmentChangeUtil = new FragmentChangeUtil(me, R.id.frame);
-        fragmentChangeUtil.addFragment(fragmentDemo, true);
-        fragmentChangeUtil.addFragment(fragmentDemo2, true);
-        fragmentChangeUtil.addFragment(fragmentDemo3, true);
-
-//        setDarkStatusBarTheme(true);
-//        setDarkNavigationBarThemeValue(true);
-//        setNavigationBarBackgroundColorValue(Color.argb(255,255,255,255));
-        
-        setLifeCircleListener(new LifeCircleListener() {
-            @Override
-            public void onCreate() {
-            
-            }
-            
-            @Override
-            public void onResume() {
-            
-            }
-            
-            @Override
-            public void onPause() {
-            
-            }
-            
-            @Override
-            public void onDestroy() {
-            
-            }
-        });
-    }
-    
-    private int index;
-    
-    @Override
-    public void setEvents() {
-        //此处为组件绑定事件
-        btnToast.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                toastS("test!");
-            }
-        });
-        
-        btnChangeLng.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (BaseFrameworkSettings.selectLocale == Locale.ENGLISH) {
-                    BaseFrameworkSettings.selectLocale = Locale.CHINA;
-                } else {
-                    BaseFrameworkSettings.selectLocale = Locale.ENGLISH;
-                }
-                restartMe();
-            }
-        });
-        
-        btnGetImei.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                toast(getIMEI());
-            }
-        });
-        
-        btnPrintJsonLog.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                log("{\"employees\": [{ \"firstName\":\"Bill\" , \"lastName\":\"Gates\" },{ \"firstName\":\"George\" , \"lastName\":\"Bush\" },{ \"firstName\":\"Thomas\" , \"lastName\":\"Carter\" }]}");
-            }
-        });
-        
-        btnError.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                doTestError();
-            }
-        });
-        
-        btnTransition.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                jump(TransitionActivity.class, btnTransition);
-            }
-        });
-        
-        intentToBaseAdapter.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                jump(AdapterTestActivity.class);
-            }
-        });
-        
-        btnPermission.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                requestPermission(new String[]{Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION}, new OnPermissionResponseListener() {
-                    @Override
-                    public void onSuccess(String[] permissions) {
-                        toast("申请权限成功");
-                    }
-                    
-                    @Override
-                    public void onFail() {
-                        toast("申请权限失败");
-                    }
-                });
-            }
-        });
-        
-        btnResult.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
-                builder.setTitle("提示");
-                builder.setMessage("跳转到下一个界面后，点击“SET返回数据”按钮即可设定返回数据，当返回此界面时会显示该数据");
-                builder.setPositiveButton("知道了", new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        jump(ResponseActivity.class, new OnJumpResponseListener() {
-                            @Override
-                            public void OnResponse(JumpParameter jumpParameter) {
-                                if (jumpParameter == null) {
-                                    toast("未返回任何数据");
-                                } else {
-                                    toast("收到返回数据，参数“返回数据1”中的值为：" + jumpParameter.get("返回数据1"));
-                                }
-                            }
-                        });
-                        
-                        //亦可选用同时带参数+返回值的跳转
-                        //jump(ResponseActivity.class,new JumpParameter()
-                        //                .put("参数1", "这是一段文字参数")
-                        //                .put("参数2", "这是一段文字参数")
-                        //        , new OnResponseListener() {
-                        //    @Override
-                        //    public void OnResponse(JumpParameter parameter) {
-                        //        if (parameter==null){
-                        //            toast("未返回任何数据");
-                        //        }else{
-                        //            toast("收到返回数据，参数“返回数据1”中的值为：" + parameter.get("返回数据1"));
-                        //        }
-                        //    }
-                        //});
-                    }
-                });
-                AlertDialog dialog = builder.create();
-                dialog.show();
-            }
-        });
-        
-        btnJump.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
-                builder.setTitle("提示");
-                builder.setMessage("接下来会创建一个Bitmap，并通过BaseActivity的通道传输给下一个BaseActivity，在其中会通过相应的方法接收到这个Bitmap。\n通过BaseActivity自带的jump(...)方法可以传输任何类型的参数给下一个界面。");
-                builder.setPositiveButton("知道了", new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        Bitmap bmp = BitmapFactory.decodeResource(getResources(), R.mipmap.img_bkg);
-                        jump(JumpActivity.class, new JumpParameter()
-                                .put("参数1", "这是一段文字参数")
-                                .put("参数2", bmp)
-                        );
-                    }
-                });
-                AlertDialog dialog = builder.create();
-                dialog.show();
-            }
-        });
-        
-        linkHome.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Uri uri = Uri.parse("https://github.com/kongzue/BaseFrameworkSettings");
-                Intent intent = new Intent(Intent.ACTION_VIEW, uri);
-                startActivity(intent);
-            }
-        });
-        
-        intentToFragment.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                fragmentChangeUtil.show(index);
-                index++;
-                if (index > 2) index = 0;
-            }
-        });
-        
-        linkUpdate.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Uri uri = Uri.parse("https://github.com/kongzue/KongzueUpdateSDK");
-                Intent intent = new Intent(Intent.ACTION_VIEW, uri);
-                startActivity(intent);
-            }
-        });
-        
-        linkDialog.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Uri uri = Uri.parse("https://github.com/kongzue/Dialog");
-                Intent intent = new Intent(Intent.ACTION_VIEW, uri);
-                startActivity(intent);
-            }
-        });
-        
-        linkBvolley.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Uri uri = Uri.parse("https://github.com/kongzue/BaseVolley");
-                Intent intent = new Intent(Intent.ACTION_VIEW, uri);
-                startActivity(intent);
-            }
-        });
-        
-        linkBokhttp.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Uri uri = Uri.parse("https://github.com/kongzue/BaseOkHttp");
-                Intent intent = new Intent(Intent.ACTION_VIEW, uri);
-                startActivity(intent);
-            }
-        });
-    }
-    
-    public void hideFragment() {
-        fragmentChangeUtil.hideNow();
-    }
-    
-    private void doTestError() throws NullPointerException {
-        throw new NullPointerException("This is a exception for test");
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/kongzue/baseframeworkdemo/ResponseActivity.java b/app/src/main/java/com/kongzue/baseframeworkdemo/ResponseActivity.java
deleted file mode 100644
index 7cb036a..0000000
--- a/app/src/main/java/com/kongzue/baseframeworkdemo/ResponseActivity.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.kongzue.baseframeworkdemo;
-
-import android.view.View;
-import android.widget.Button;
-import android.widget.TextView;
-
-import com.kongzue.baseframework.BaseActivity;
-import com.kongzue.baseframework.interfaces.Layout;
-import com.kongzue.baseframework.interfaces.SwipeBack;
-import com.kongzue.baseframework.util.JumpParameter;
-
-@Layout(R.layout.activity_response)
-@SwipeBack(true)
-public class ResponseActivity extends BaseActivity {
-
-    private TextView txtTitle;
-    private TextView txtP1;
-    private Button btnSet;
-    private Button btnClose;
-
-    @Override
-    public void initViews() {
-        txtTitle = findViewById(R.id.txt_title);
-        txtP1 = findViewById(R.id.txt_p1);
-        btnSet = findViewById(R.id.btn_set);
-        btnClose = findViewById(R.id.btn_close);
-    }
-
-    @Override
-    public void initDatas(JumpParameter parameter) {
-
-    }
-
-    @Override
-    public void setEvents() {
-        btnSet.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if ((boolean) getParameter().get("needResponse") == true) {
-                    setResponse(new JumpParameter().put("返回数据1", "测试成功"));
-                    btnSet.setText("已设置返回数据：key=返回数据1  value=测试成功");
-                } else {
-                    toast("needResponse = false：不需要返回数据给上一个界面");
-                }
-            }
-        });
-
-        btnClose.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                finish();
-            }
-        });
-    }
-}
diff --git a/app/src/main/java/com/kongzue/baseframeworkdemo/TransitionActivity.java b/app/src/main/java/com/kongzue/baseframeworkdemo/TransitionActivity.java
deleted file mode 100644
index 491506b..0000000
--- a/app/src/main/java/com/kongzue/baseframeworkdemo/TransitionActivity.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.kongzue.baseframeworkdemo;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import android.view.View;
-import android.widget.Button;
-
-import com.kongzue.baseframework.BaseActivity;
-import com.kongzue.baseframework.interfaces.Layout;
-import com.kongzue.baseframework.interfaces.SwipeBack;
-import com.kongzue.baseframework.util.JumpParameter;
-
-@Layout(R.layout.activity_transition)
-@SwipeBack(true)
-public class TransitionActivity extends BaseActivity {
-    
-    private Button btnTransition;
-    
-    @Override
-    public void initViews() {
-        btnTransition = findViewById(R.id.btn_transition);
-    }
-    
-    @Override
-    public void initDatas(JumpParameter paramer) {
-    
-    }
-    
-    @Override
-    public void setEvents() {
-        btnTransition.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                onBackPressed();
-            }
-        });
-    }
-}
diff --git a/app/src/main/java/com/kongzue/baseframeworkdemo/activity/DemoActivity.java b/app/src/main/java/com/kongzue/baseframeworkdemo/activity/DemoActivity.java
index ef3831a..be01f5b 100644
--- a/app/src/main/java/com/kongzue/baseframeworkdemo/activity/DemoActivity.java
+++ b/app/src/main/java/com/kongzue/baseframeworkdemo/activity/DemoActivity.java
@@ -47,7 +47,7 @@ public class DemoActivity extends BaseActivity {
     @Override
     public void initViews() {
         tabbar = findViewById(R.id.tabbar);
-    
+        
         List<Tab> tabs = new ArrayList<>();
         tabs.add(new Tab(this, getString(R.string.introduction), R.mipmap.img_tab_introduction));
         tabs.add(new Tab(this, getString(R.string.function), R.mipmap.img_maintab_function));
@@ -64,11 +64,11 @@ public void initFragment(FragmentChangeUtil fragmentChangeUtil) {
         fragmentChangeUtil.addFragment(introductionFragment);
         fragmentChangeUtil.addFragment(functionFragment);
         fragmentChangeUtil.addFragment(aboutFragment);
-    
+        
         getFragmentChangeUtil().setOnFragmentChangeListener(new OnFragmentChangeListener() {
             @Override
             public void onChange(int index, BaseFragment fragment) {
-                log("index:"+index);
+                log("index:" + index);
                 tabbar.setNormalFocusIndex(index);
             }
         });
diff --git a/app/src/main/java/com/kongzue/baseframeworkdemo/activity/JumpActivity.java b/app/src/main/java/com/kongzue/baseframeworkdemo/activity/JumpActivity.java
index 363f4c6..af94264 100644
--- a/app/src/main/java/com/kongzue/baseframeworkdemo/activity/JumpActivity.java
+++ b/app/src/main/java/com/kongzue/baseframeworkdemo/activity/JumpActivity.java
@@ -47,5 +47,4 @@ public void onClick(View v) {
             }
         });
     }
-    
 }
diff --git a/baseframework/build.gradle b/baseframework/build.gradle
index a3c093f..98568f9 100644
--- a/baseframework/build.gradle
+++ b/baseframework/build.gradle
@@ -6,7 +6,7 @@ def siteUrl = 'https://github.com/kongzue/BaseFramework' //项目在github主页
 def gitUrl = 'https://github.com/kongzue/BaseFramework.git'   //Git仓库的地址
 
 group = "com.kongzue.baseframeworkx"//发布aar前缀根节点
-version = "6.7.9"//发布aar的库版本
+version = "6.7.9.3"//发布aar的库版本
 
 android {
     compileSdkVersion 30
@@ -15,7 +15,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 30
         versionCode 120
-        versionName "6.7.9"
+        versionName "6.7.9.3"
     }
 
     buildTypes {
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java b/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java
index 6546375..09a6732 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/BaseActivity.java
@@ -22,6 +22,7 @@
 
 import androidx.annotation.ColorInt;
 import androidx.annotation.ColorRes;
+import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
@@ -92,6 +93,7 @@
 import java.util.Properties;
 import java.util.Set;
 import java.util.TimerTask;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 import static com.kongzue.baseframework.BaseFrameworkSettings.BETA_PLAN;
 import static com.kongzue.baseframework.BaseFrameworkSettings.DEBUGMODE;
@@ -1391,10 +1393,13 @@ protected void onResume() {
             globalLifeCircleListener.onResume(me, me.getClass().getName());
         }
         AppManager.setActiveActivity(this);
+        
         if (resumeRunnableList != null) {
-            for (Runnable runnable : resumeRunnableList) {
+            CopyOnWriteArrayList<Runnable> copyOnWriteArrayList = new CopyOnWriteArrayList<>(resumeRunnableList);
+            for (Runnable runnable : copyOnWriteArrayList) {
                 runOnMain(runnable);
             }
+            resumeRunnableList.removeAll(copyOnWriteArrayList);
         }
     }
     
@@ -1737,4 +1742,12 @@ protected void onActivityResult(int requestCode, int resultCode, @Nullable Inten
             activityResultCallbackList.removeAll(runActivityResultCallback);
         }
     }
+    
+    public static <B extends BaseActivity> B getActivity(String instanceKey) {
+        return (B) AppManager.getInstance().getActivityInstance(instanceKey);
+    }
+    
+    public static <B extends BaseActivity> B getActivity(Class c) {
+        return (B) AppManager.getInstance().getActivityInstance(c);
+    }
 }
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java b/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java
index b5cbc03..41b6648 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/BaseFragment.java
@@ -25,6 +25,7 @@
 import com.kongzue.baseframework.interfaces.Layout;
 import com.kongzue.baseframework.interfaces.OnClick;
 import com.kongzue.baseframework.interfaces.OnClicks;
+import com.kongzue.baseframework.util.AppManager;
 import com.kongzue.baseframework.util.CycleRunner;
 import com.kongzue.baseframework.util.FragmentChangeUtil;
 import com.kongzue.baseframework.util.JumpParameter;
@@ -38,6 +39,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.TimerTask;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 import static com.kongzue.baseframework.BaseFrameworkSettings.DEBUGMODE;
 
@@ -236,7 +238,7 @@ private void bindAutoEvent() {
             backView.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    me.onBackPressed();
+                    if (me != null) me.onBackPressed();
                 }
             });
         }
@@ -303,19 +305,19 @@ public final <T extends View> T findViewById(@IdRes int id) {
     
     //简易吐司
     public void toast(final Object obj) {
-        me.toast(obj);
+        if (me != null) me.toast(obj);
     }
     
     public void toastS(final Object obj) {
-        Toaster.build(me).show(obj.toString());
+        if (me != null) Toaster.build(me).show(obj.toString());
     }
     
     public void log(final Object obj) {
-        me.log(obj);
+        if (me != null) me.log(obj);
     }
     
     public void errorLog(final Object obj) {
-        me.errorLog(obj);
+        if (me != null) me.errorLog(obj);
     }
     
     //位移动画
@@ -340,13 +342,13 @@ public ObjectAnimator moveAnimation(Object obj, String perference, float aimValu
     
     //用于进行dip和px转换
     public int dip2px(float dpValue) {
-        final float scale = me.getResources().getDisplayMetrics().density;
+        final float scale = getResources().getDisplayMetrics().density;
         return (int) (dpValue * scale + 0.5f);
     }
     
     //用于进行px和dip转换
     public int px2dip(float pxValue) {
-        final float scale = me.getResources().getDisplayMetrics().density;
+        final float scale = getResources().getDisplayMetrics().density;
         return (int) (pxValue / scale + 0.5f);
     }
     
@@ -359,38 +361,46 @@ public boolean isNull(String s) {
     
     //更好用的跳转方式
     public boolean jump(Class<?> cls) {
+        if (me == null) return false;
         return me.jump(cls);
     }
     
     //可以传任何类型参数的跳转方式
     public boolean jump(Class<?> cls, JumpParameter jumpParameter) {
+        if (me == null) return false;
         return me.jump(cls, jumpParameter);
     }
     
     //带返回值的跳转
     public boolean jump(Class<?> cls, OnJumpResponseListener onJumpResponseListener) {
+        if (me == null) return false;
         return me.jump(cls, onJumpResponseListener);
     }
     
     //带返回值的跳转
     public boolean jump(Class<?> cls, JumpParameter jumpParameter, OnJumpResponseListener onResponseListener) {
+        if (me == null) return false;
         return me.jump(cls, jumpParameter, onResponseListener);
     }
     
     //带共享元素的跳转方式
     public boolean jump(Class<?> cls, View transitionView) {
+        if (me == null) return false;
         return me.jump(cls, transitionView);
     }
     
     public boolean jump(Class<?> cls, JumpParameter jumpParameter, View transitionView) {
+        if (me == null) return false;
         return me.jump(cls, jumpParameter, transitionView);
     }
     
     public boolean jump(Class<?> cls, OnJumpResponseListener onJumpResponseListener, View transitionView) {
+        if (me == null) return false;
         return me.jump(cls, onJumpResponseListener, transitionView);
     }
     
     public boolean jump(Class<?> cls, JumpParameter jumpParameter, OnJumpResponseListener onJumpResponseListener, View transitionView) {
+        if (me == null) return false;
         return me.jump(cls, jumpParameter, onJumpResponseListener, transitionView);
     }
     
@@ -400,10 +410,12 @@ public boolean jump(Class<?> cls, JumpParameter jumpParameter, OnJumpResponseLis
      * @param index 角标
      */
     public void jump(int index) {
+        if (me == null) return;
         me.changeFragment(index);
     }
     
     public void jump(int index, int enterAnimResId, int exitAnimResId) {
+        if (me == null) return;
         me.changeFragment(index, enterAnimResId, exitAnimResId);
     }
     
@@ -413,10 +425,12 @@ public void jump(int index, int enterAnimResId, int exitAnimResId) {
      * @param baseFragment 指定的 BaseFragment 对象
      */
     public void jump(BaseFragment baseFragment) {
+        if (me == null) return;
         me.changeFragment(baseFragment);
     }
     
     public void jump(BaseFragment baseFragment, int enterAnimResId, int exitAnimResId) {
+        if (me == null) return;
         me.changeFragment(baseFragment, enterAnimResId, exitAnimResId);
     }
     
@@ -430,7 +444,7 @@ public void jump(BaseFragment baseFragment, JumpParameter parameter) {
         if (parameter != null) {
             ParameterCache.getInstance().set(baseFragment.getClass().getName(), parameter);
         }
-        me.changeFragment(baseFragment);
+        if (me != null) me.changeFragment(baseFragment);
     }
     
     /**
@@ -440,6 +454,7 @@ public void jump(BaseFragment baseFragment, JumpParameter parameter) {
      * @param jumpParameter 要传递参数
      */
     public void jump(int index, JumpParameter jumpParameter) {
+        if (me == null) return;
         if (jumpParameter != null) {
             ParameterCache.getInstance().set(me.getFragmentChangeUtil().getFragment(index).getClass().getName(), jumpParameter);
         }
@@ -456,6 +471,7 @@ public void jump(int index, JumpParameter jumpParameter) {
      * @param onJumpResponseListener 回调
      */
     public void jump(BaseFragment baseFragment, JumpParameter jumpParameter, OnJumpResponseListener onJumpResponseListener) {
+        if (me == null) return;
         ParameterCache.getInstance().cleanResponse(this.getClass().getName());
         if (jumpParameter == null) {
             jumpParameter = new JumpParameter();
@@ -475,6 +491,7 @@ public void jump(BaseFragment baseFragment, JumpParameter jumpParameter, OnJumpR
      * @param onJumpResponseListener 回调
      */
     public void jump(int index, JumpParameter jumpParameter, OnJumpResponseListener onJumpResponseListener) {
+        if (me == null) return;
         ParameterCache.getInstance().cleanResponse(this.getClass().getName());
         if (jumpParameter == null) {
             jumpParameter = new JumpParameter();
@@ -487,6 +504,7 @@ public void jump(int index, JumpParameter jumpParameter, OnJumpResponseListener
     }
     
     public void jump(int index, OnJumpResponseListener onJumpResponseListener) {
+        if (me == null) return;
         ParameterCache.getInstance().cleanResponse(this.getClass().getName());
         JumpParameter jumpParameter = new JumpParameter();
         this.onJumpResponseListener = onJumpResponseListener;
@@ -498,6 +516,7 @@ public void jump(int index, OnJumpResponseListener onJumpResponseListener) {
     
     //目标Fragment：设定要返回的数据
     public void setFragmentResponse(JumpParameter jumpParameter) {
+        if (me == null) return;
         FragmentChangeUtil fragmentChangeUtil = me.getFragmentChangeUtil();
         BaseFragment baseFragment = fragmentChangeUtil.getFragment(getFragmentParameter().getString("responseClassName"));
         if (baseFragment != null) {
@@ -543,16 +562,17 @@ public void returnFragmentParameter(JumpParameter parameter) {
     
     //大型打印使用，Log默认是有字数限制的，如有需要打印更长的文本可以使用此方法
     public void bigLog(String msg) {
-        me.bigLog(msg);
+        if (me != null) me.bigLog(msg);
     }
     
     //目标Activity：设定要返回的数据
     public void setResponse(JumpParameter jumpParameter) {
-        me.setResponse(jumpParameter);
+        if (me != null) me.setResponse(jumpParameter);
     }
     
     //获取跳转参数
     public JumpParameter getParameter() {
+        if (me == null) return new JumpParameter();
         return me.getParameter();
     }
     
@@ -560,35 +580,37 @@ public JumpParameter getParameter() {
     public void jumpAnim(int enterAnim, int exitAnim) {
         int version = Integer.valueOf(Build.VERSION.SDK_INT);
         if (version > 5) {
-            me.overridePendingTransition(enterAnim, exitAnim);
+            if (me != null) me.overridePendingTransition(enterAnim, exitAnim);
         }
     }
     
     //权限申请
     public void requestPermission(String[] permissions, OnPermissionResponseListener onPermissionResponseListener) {
-        me.requestPermission(permissions, onPermissionResponseListener);
+        if (me != null) me.requestPermission(permissions, onPermissionResponseListener);
     }
     
     //多权限检查
     public boolean checkPermissions(String[] permissions) {
+        if (me == null) return false;
         return me.checkPermissions(permissions);
     }
     
     //单权限检查
     public boolean checkPermissions(String permission) {
+        if (me == null) return false;
         return me.checkPermissions(permission);
     }
     
     public void runOnMain(Runnable runnable) {
-        me.runOnMain(runnable);
+        if (me != null) me.runOnMain(runnable);
     }
     
     public void runOnMainDelayed(Runnable runnable, long time) {
-        me.runOnMainDelayed(runnable, time);
+        if (me != null) me.runOnMainDelayed(runnable, time);
     }
     
     public void runDelayed(Runnable runnable, long time) {
-        me.runDelayed(runnable, time);
+        if (me != null) me.runDelayed(runnable, time);
     }
     
     private List<CycleRunner> cycleTimerList = new ArrayList<>();
@@ -624,6 +646,7 @@ public void run() {
      * @return 是否成功复制
      */
     public boolean copy(String s) {
+        if (me == null) return false;
         return me.copy(s);
     }
     
@@ -634,15 +657,15 @@ public boolean copy(String s) {
      * @param editText 必须依赖一个 EditText
      */
     public void setIMMStatus(boolean show, EditText editText) {
-        me.showIME(show, editText);
+        if (me != null) me.showIME(show, editText);
     }
     
     public void showIME(@NonNull EditText editText) {
-        me.showIME(editText);
+        if (me != null) me.showIME(editText);
     }
     
     public void hideIME(@Nullable EditText editText) {
-        me.hideIME(editText);
+        if (me != null) me.hideIME(editText);
     }
     
     /**
@@ -683,9 +706,11 @@ public void onResume() {
             lifeCircleListener.onResume();
         }
         if (resumeRunnableList != null) {
-            for (Runnable runnable : resumeRunnableList) {
+            CopyOnWriteArrayList<Runnable> copyOnWriteArrayList = new CopyOnWriteArrayList<>(resumeRunnableList);
+            for (Runnable runnable : copyOnWriteArrayList) {
                 runOnMain(runnable);
             }
+            resumeRunnableList.removeAll(copyOnWriteArrayList);
         }
     }
     
@@ -752,11 +777,13 @@ public boolean openUrl(String url) {
     
     //打开指定App
     public boolean openApp(String packageName) {
+        if (me == null) return false;
         return me.openApp(packageName);
     }
     
     //检测App是否已安装
     public boolean isInstallApp(String packageName) {
+        if (me == null) return false;
         return me.isInstallApp(packageName);
     }
     
@@ -765,44 +792,52 @@ public Bundle getSavedInstanceState() {
     }
     
     public int getStatusBarHeight() {
+        if (me == null) return 0;
         return me.getStatusBarHeight();
     }
     
     //获取屏幕宽度
     public int getDisplayWidth() {
+        if (me == null) return 0;
         return me.getDisplayWidth();
     }
     
     //获取屏幕可用部分高度（屏幕高度-状态栏高度-屏幕底栏高度）
     public int getDisplayHeight() {
+        if (me == null) return 0;
         return me.getDisplayHeight();
     }
     
     //获取底栏高度
     public int getNavbarHeight() {
+        if (me == null) return 0;
         return me.getNavbarHeight();
     }
     
     //获取真实的屏幕高度，注意判断非0
     public int getRootHeight() {
+        if (me == null) return 0;
         return me.getRootHeight();
     }
     
     public String getIMEI() {
+        if (me == null) return "";
         return me.getIMEI();
     }
     
     public String getAndroidId() {
+        if (me == null) return "";
         return me.getAndroidId();
     }
     
     public String getMacAddress() {
+        if (me == null) return "";
         return me.getMacAddress();
     }
     
     //支持最低SDK的getColor方法
     public int getColorS(@ColorRes int id) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && me != null) {
             return getResources().getColor(id, me.getTheme());
         } else {
             return getResources().getColor(id);
@@ -840,7 +875,7 @@ public boolean isAddedCompat() {
     }
     
     public void click(View v, View.OnClickListener onClickListener) {
-        me.click(v, onClickListener);
+        if (me != null) me.click(v, onClickListener);
     }
     
     public boolean onBack() {
@@ -852,10 +887,11 @@ public String getInstanceKey() {
     }
     
     public void startActivityForResult(Intent intent, ActivityResultCallback activityResultCallback) {
-        me.startActivityForResult(intent, activityResultCallback);
+        if (me != null) me.startActivityForResult(intent, activityResultCallback);
     }
     
     public void startActivityForResult(Intent intent, ActivityResultCallback activityResultCallback, @Nullable Bundle options) {
-        me.startActivityForResult(intent, activityResultCallback, options);
+        if (me != null) me.startActivityForResult(intent, activityResultCallback, options);
     }
+    
 }
\ No newline at end of file
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/BaseFrameworkSettings.java b/baseframework/src/main/java/com/kongzue/baseframework/BaseFrameworkSettings.java
index d6c61d1..9fc2bd4 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/BaseFrameworkSettings.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/BaseFrameworkSettings.java
@@ -27,6 +27,9 @@ public class BaseFrameworkSettings {
     //是否开启debug模式，此开关影响打印Log日志等行为
     public static boolean DEBUGMODE = true;
     
+    //Debug模式详细版，会打印日志位置
+    public static boolean DEBUG_DETAILS = true;
+    
     //是否开启beta计划，详情请参阅 https://github.com/kongzue/BaseFramework
     public static boolean BETA_PLAN = false;
     
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/DebugLogG.java b/baseframework/src/main/java/com/kongzue/baseframework/util/DebugLogG.java
index 2bded3d..aa636fe 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/util/DebugLogG.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/util/DebugLogG.java
@@ -5,11 +5,13 @@
 import android.util.Log;
 
 import com.kongzue.baseframework.BaseApp;
+import com.kongzue.baseframework.BaseFrameworkSettings;
 
 import java.io.File;
 import java.io.FileWriter;
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -38,21 +40,43 @@ public static void LogI(Object obj) {
         try {
             if (DEBUGMODE) {
                 if (obj instanceof Map) {
-                    Log.v(">>>>>>", "Map: " + obj.getClass().getName() + "@" + Integer.toHexString(obj.hashCode()) + " {\n");
+                    String logStr = getCodeLineStr() + "Map: " + obj.getClass().getName() + "@" + Integer.toHexString(obj.hashCode()) + " {\n";
                     Set keySet = ((Map) obj).keySet();
                     for (Object key : keySet) {
                         String keyStr = String.valueOf(key);
                         String valueStr = String.valueOf(((Map) obj).get(key));
-                        Log.v(">>>>>>", "    \"" + keyStr + "\": \"" + valueStr + "\",");
+                        logStr = logStr + "    \"" + keyStr + "\": \"" + valueStr + "\",\n";
                     }
-                    Log.v(">>>>>>", "}");
+                    logStr = logStr + "}";
+                    Log.v(">>>>>>", logStr);
                 } else if (obj instanceof List) {
                     List list = (List) obj;
-                    Log.v(">>>>>>", "List: " + obj.getClass().getName() + "@" + Integer.toHexString(obj.hashCode()) + " [\n");
+                    String logStr = getCodeLineStr() + "List: " + obj.getClass().getName() + "@" + Integer.toHexString(obj.hashCode()) + " [\n";
                     for (Object value : list) {
-                        Log.v(">>>>>>", "    " + value + ",");
+                        logStr = logStr + "    " + value + ",\n";
+                    }
+                    logStr = logStr + "]";
+                    Log.v(">>>>>>", logStr);
+                } else if (obj.getClass().isArray()) {
+                    if (obj instanceof int[]) {
+                        Log.v(">>>>>>", getCodeLineStr() + "Array(int[]): " + Arrays.toString((int[]) obj));
+                    } else if (obj instanceof boolean[]) {
+                        Log.v(">>>>>>", getCodeLineStr() + "Array(boolean[]): " + Arrays.toString((boolean[]) obj));
+                    } else if (obj instanceof byte[]) {
+                        Log.v(">>>>>>", getCodeLineStr() + "Array(byte[]): " + Arrays.toString((byte[]) obj));
+                    } else if (obj instanceof char[]) {
+                        Log.v(">>>>>>", getCodeLineStr() + "Array(char[]): " + Arrays.toString((char[]) obj));
+                    } else if (obj instanceof double[]) {
+                        Log.v(">>>>>>", getCodeLineStr() + "Array(double[]): " + Arrays.toString((double[]) obj));
+                    } else if (obj instanceof float[]) {
+                        Log.v(">>>>>>", getCodeLineStr() + "Array(float[]): " + Arrays.toString((float[]) obj));
+                    } else if (obj instanceof long[]) {
+                        Log.v(">>>>>>", getCodeLineStr() + "Array(long[]): " + Arrays.toString((long[]) obj));
+                    } else if (obj instanceof short[]) {
+                        Log.v(">>>>>>", getCodeLineStr() + "Array(short[]): " + Arrays.toString((short[]) obj));
+                    } else {
+                        Log.v(">>>>>>", getCodeLineStr() + "Array(obj[]): " + Arrays.toString((Object[]) obj));
                     }
-                    Log.v(">>>>>>", "]");
                 } else {
                     String msg = String.valueOf(obj);
                     if (isNull(msg)) {
@@ -63,7 +87,7 @@ public static void LogI(Object obj) {
                     } else {
                         LogG(msg);
                         if (!JsonFormat.formatJson(msg)) {
-                            Log.v(">>>>>>", msg);
+                            Log.v(">>>>>>", getCodeLineStr() + msg);
                         }
                     }
                 }
@@ -73,6 +97,26 @@ public static void LogI(Object obj) {
         }
     }
     
+    public static String getCodeLineStr() {
+        if (!BaseFrameworkSettings.DEBUG_DETAILS) {
+            return "";
+        }
+        StackTraceElement[] stackTraceElements = Thread.currentThread().getStackTrace();
+        int line = -1;
+        boolean findFrameworkPackage = false;
+        for (int i = 0; i < stackTraceElements.length; i++) {
+            if (stackTraceElements[i].getClassName().startsWith("com.kongzue.baseframework.")) {
+                findFrameworkPackage = true;
+            }
+            if (findFrameworkPackage && !stackTraceElements[i].getClassName().startsWith("com.kongzue.baseframework.")) {
+                line = i;
+                break;
+            }
+        }
+        if (line == -1) return "";
+        return "Log.[" + stackTraceElements[line].getMethodName() + "](" + stackTraceElements[line].getFileName() + ":" + stackTraceElements[line].getLineNumber() + ")\n";
+    }
+    
     public static void LogE(Object obj) {
         try {
             if (DEBUGMODE) {
diff --git a/baseframework/src/main/java/com/kongzue/baseframework/util/JsonFormat.java b/baseframework/src/main/java/com/kongzue/baseframework/util/JsonFormat.java
index 9f86161..9c8ffc1 100644
--- a/baseframework/src/main/java/com/kongzue/baseframework/util/JsonFormat.java
+++ b/baseframework/src/main/java/com/kongzue/baseframework/util/JsonFormat.java
@@ -7,6 +7,7 @@
 import org.json.JSONObject;
 
 import static com.kongzue.baseframework.BaseFrameworkSettings.DEBUGMODE;
+import static com.kongzue.baseframework.util.DebugLogG.getCodeLineStr;
 
 /**
  * Author: @Kongzue
@@ -37,11 +38,7 @@ public static boolean formatJson(String msg) {
         } catch (JSONException e) {
             return false;
         }
-        
-        String[] lines = message.split(LINE_SEPARATOR);
-        for (String line : lines) {
-            Log.i(">>>>>>", line);
-        }
+        Log.v(">>>>>>", getCodeLineStr() +  message);
         return true;
     }