1.添加积分规则

2.添加分享文章提示
3.修复5.1手机打开webview报错bug
4.修复recyclerview在加载更多时，点击会调用多次接口bug
5.升级gradle版本至3.5.1,SDK提升至29

app/build.gradle

@@ -48,8 +48,9 @@ android {
 
     buildTypes {
         debug {
-            buildConfigField "boolean", "LOG_DEBUG", "true"
+            buildConfigField "boolean", "LOG_DEBUG",  "true"
             buildConfigField "boolean", "USE_CANARY", "false"
+            buildConfigField "String", "BUGLY_KE", '"xxxxxx"'
             minifyEnabled false
             shrinkResources false
             zipAlignEnabled false
@@ -57,8 +58,9 @@ android {
         }
 
         release {
-            buildConfigField "boolean", "LOG_DEBUG", "false"
+            buildConfigField "boolean", "LOG_DEBUG",  "false"
             buildConfigField "boolean", "USE_CANARY", "false"
+            buildConfigField "String", "BUGLY_KE", '"5a5f6366fc"'
             minifyEnabled true//开启混淆
             shrinkResources true
             zipAlignEnabled true//去除无用资源
@@ -86,7 +88,7 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     //androidX基础库
     implementation "androidx.appcompat:appcompat:1.1.0"
-    implementation 'com.google.android.material:material:1.1.0-alpha10'
+    implementation 'com.google.android.material:material:1.1.0-beta01'
     implementation "androidx.constraintlayout:constraintlayout:1.1.3"
     implementation "androidx.preference:preference:1.1.0"
     implementation "androidx.cardview:cardview:1.0.0"
@@ -95,8 +97,8 @@ dependencies {
     kapt rootProject.ext.dependencies["dagger2-compiler"]
 
     //黄油刀
-    implementation "com.jakewharton:butterknife:10.0.0"
-    kapt "com.jakewharton:butterknife-compiler:10.0.0"
+    implementation "com.jakewharton:butterknife:10.1.0"
+    kapt "com.jakewharton:butterknife-compiler:10.1.0"
     //test
     testImplementation rootProject.ext.dependencies["junit"]
     debugImplementation rootProject.ext.dependencies["canary-debug"]

app/priguardMapping.txt

@@ -1,7 +1,7 @@
 # compiler: R8
-# compiler_version: 1.5.64
+# compiler_version: 1.5.68
 # min_api: 21
-# pg_map_id: 3ecf2ab
+# pg_map_id: 92d2a40
 butterknife.-$$Lambda$Unbinder$aAZZEjRDCcxQlrGZAdKWmLXqruY -> butterknife.a:
     butterknife.-$$Lambda$Unbinder$aAZZEjRDCcxQlrGZAdKWmLXqruY INSTANCE -> a
 butterknife.Unbinder$-CC -> butterknife.b:
@@ -787,25 +787,28 @@ com.afollestad.materialdialogs.DialogBehavior -> com.afollestad.materialdialogs.
     void setWindowConstraints(android.content.Context,android.view.Window,com.afollestad.materialdialogs.internal.main.DialogLayout,java.lang.Integer) -> a
     void onPostShow(com.afollestad.materialdialogs.MaterialDialog) -> b
 com.afollestad.materialdialogs.LayoutMode -> com.afollestad.materialdialogs.LayoutMode:
-    com.afollestad.materialdialogs.LayoutMode[] $VALUES -> b
-    com.afollestad.materialdialogs.LayoutMode WRAP_CONTENT -> a
+    com.afollestad.materialdialogs.LayoutMode MATCH_PARENT -> a
+    com.afollestad.materialdialogs.LayoutMode[] $VALUES -> c
+    com.afollestad.materialdialogs.LayoutMode WRAP_CONTENT -> b
 com.afollestad.materialdialogs.MaterialDialog -> com.afollestad.materialdialogs.MaterialDialog:
-    com.afollestad.materialdialogs.DialogBehavior dialogBehavior -> o
-    com.afollestad.materialdialogs.DialogBehavior DEFAULT_BEHAVIOR -> p
+    com.afollestad.materialdialogs.DialogBehavior dialogBehavior -> q
+    com.afollestad.materialdialogs.DialogBehavior DEFAULT_BEHAVIOR -> r
     android.graphics.Typeface titleFont -> c
-    java.lang.Integer maxWidth -> g
-    com.afollestad.materialdialogs.internal.main.DialogLayout view -> h
-    java.lang.Float cornerRadius -> f
+    java.util.List neutralListeners -> o
+    com.afollestad.materialdialogs.internal.main.DialogLayout view -> j
+    java.lang.Integer maxWidth -> i
+    java.lang.Float cornerRadius -> h
     android.graphics.Typeface bodyFont -> d
     android.graphics.Typeface buttonFont -> e
     java.util.Map config -> a
-    android.content.Context windowContext -> n
-    java.util.List dismissListeners -> j
-    java.util.List preShowListeners -> i
+    android.content.Context windowContext -> p
+    boolean cancelOnTouchOutside -> f
+    boolean cancelable -> g
+    java.util.List negativeListeners -> n
     boolean autoDismissEnabled -> b
-    java.util.List neutralListeners -> m
-    java.util.List negativeListeners -> l
-    java.util.List positiveListeners -> k
+    java.util.List positiveListeners -> m
+    java.util.List dismissListeners -> l
+    java.util.List preShowListeners -> k
     java.lang.Object config(java.lang.String) -> a
     com.afollestad.materialdialogs.MaterialDialog cornerRadius(java.lang.Float,java.lang.Integer) -> a
     com.afollestad.materialdialogs.MaterialDialog cornerRadius$default(com.afollestad.materialdialogs.MaterialDialog,java.lang.Float,java.lang.Integer,int,java.lang.Object) -> a
@@ -820,15 +823,17 @@ com.afollestad.materialdialogs.MaterialDialog -> com.afollestad.materialdialogs.
     android.graphics.Typeface getBodyFont() -> b
     com.afollestad.materialdialogs.MaterialDialog negativeButton(java.lang.Integer,java.lang.CharSequence,kotlin.jvm.functions.Function1) -> b
     com.afollestad.materialdialogs.MaterialDialog negativeButton$default(com.afollestad.materialdialogs.MaterialDialog,java.lang.Integer,java.lang.CharSequence,kotlin.jvm.functions.Function1,int,java.lang.Object) -> b
-    java.util.Map getConfig() -> c
+    boolean getCancelOnTouchOutside() -> c
     com.afollestad.materialdialogs.MaterialDialog positiveButton(java.lang.Integer,java.lang.CharSequence,kotlin.jvm.functions.Function1) -> c
     com.afollestad.materialdialogs.MaterialDialog positiveButton$default(com.afollestad.materialdialogs.MaterialDialog,java.lang.Integer,java.lang.CharSequence,kotlin.jvm.functions.Function1,int,java.lang.Object) -> c
-    java.util.List getDismissListeners$com_afollestad_material_dialogs_core() -> d
-    java.util.List getPreShowListeners$com_afollestad_material_dialogs_core() -> e
-    com.afollestad.materialdialogs.internal.main.DialogLayout getView() -> f
-    android.content.Context getWindowContext() -> g
-    void invalidateBackgroundColorAndRadius() -> h
-    void setWindowConstraints() -> i
+    boolean getCancelable() -> d
+    java.util.Map getConfig() -> e
+    java.util.List getDismissListeners$com_afollestad_material_dialogs_core() -> f
+    java.util.List getPreShowListeners$com_afollestad_material_dialogs_core() -> g
+    com.afollestad.materialdialogs.internal.main.DialogLayout getView() -> h
+    android.content.Context getWindowContext() -> i
+    void invalidateBackgroundColorAndRadius() -> j
+    void setWindowConstraints() -> k
 com.afollestad.materialdialogs.MaterialDialog$Companion -> com.afollestad.materialdialogs.MaterialDialog$a:
 com.afollestad.materialdialogs.MaterialDialog$WhenMappings -> com.afollestad.materialdialogs.b:
     int[] $EnumSwitchMapping$0 -> a
@@ -867,6 +872,117 @@ com.afollestad.materialdialogs.actions.DialogActionExtKt -> com.afollestad.mater
     boolean hasActionButtons(com.afollestad.materialdialogs.MaterialDialog) -> a
     void setActionButtonEnabled(com.afollestad.materialdialogs.MaterialDialog,com.afollestad.materialdialogs.WhichButton,boolean) -> a
     boolean hasActionButton(com.afollestad.materialdialogs.MaterialDialog,com.afollestad.materialdialogs.WhichButton) -> b
+com.afollestad.materialdialogs.bottomsheets.BottomSheet -> com.afollestad.materialdialogs.bottomsheets.BottomSheet:
+    android.view.ViewGroup bottomSheetView -> b
+    com.afollestad.materialdialogs.MaterialDialog dialog -> e
+    kotlin.properties.ReadWriteProperty actualPeekHeight$delegate -> g
+    com.google.android.material.bottomsheet.BottomSheetBehavior bottomSheetBehavior -> a
+    kotlin.properties.ReadWriteProperty defaultPeekHeight$delegate -> f
+    com.afollestad.materialdialogs.internal.button.DialogActionButtonLayout buttonsLayout -> d
+    com.afollestad.materialdialogs.LayoutMode layoutMode -> h
+    androidx.coordinatorlayout.widget.CoordinatorLayout rootView -> c
+    kotlin.reflect.KProperty[] $$delegatedProperties -> i
+    int access$getActualPeekHeight$p(com.afollestad.materialdialogs.bottomsheets.BottomSheet) -> a
+    void access$invalidateDividers(com.afollestad.materialdialogs.bottomsheets.BottomSheet,int) -> a
+    void carryOverWindowFlags(android.view.Window,android.app.Activity) -> a
+    android.view.ViewGroup createView(android.content.Context,android.view.Window,android.view.LayoutInflater,com.afollestad.materialdialogs.MaterialDialog) -> a
+    com.google.android.material.bottomsheet.BottomSheetBehavior getBottomSheetBehavior$com_afollestad_material_dialogs_bottomsheets() -> a
+    com.afollestad.materialdialogs.internal.main.DialogLayout getDialogLayout(android.view.ViewGroup) -> a
+    int getThemeRes(boolean) -> a
+    void onPreShow(com.afollestad.materialdialogs.MaterialDialog) -> a
+    void setBackgroundColor(com.afollestad.materialdialogs.internal.main.DialogLayout,int,float) -> a
+    void setDefaultPeekHeight$com_afollestad_material_dialogs_bottomsheets(int) -> a
+    void setWindowConstraints(android.content.Context,android.view.Window,com.afollestad.materialdialogs.internal.main.DialogLayout,java.lang.Integer) -> a
+    android.view.ViewGroup access$getBottomSheetView$p(com.afollestad.materialdialogs.bottomsheets.BottomSheet) -> b
+    void access$setActualPeekHeight$p(com.afollestad.materialdialogs.bottomsheets.BottomSheet,int) -> b
+    int getDefaultPeekHeight$com_afollestad_material_dialogs_bottomsheets() -> b
+    void invalidateDividers(int) -> b
+    void onPostShow(com.afollestad.materialdialogs.MaterialDialog) -> b
+    com.afollestad.materialdialogs.internal.button.DialogActionButtonLayout access$getButtonsLayout$p(com.afollestad.materialdialogs.bottomsheets.BottomSheet) -> c
+    int getActualPeekHeight() -> c
+    void setActualPeekHeight(int) -> c
+    com.afollestad.materialdialogs.MaterialDialog access$getDialog$p(com.afollestad.materialdialogs.bottomsheets.BottomSheet) -> d
+    void hideButtons() -> d
+    void access$showButtons(com.afollestad.materialdialogs.bottomsheets.BottomSheet) -> e
+    void setupBottomSheetBehavior() -> e
+    void showButtons() -> f
+com.afollestad.materialdialogs.bottomsheets.BottomSheet$Companion -> com.afollestad.materialdialogs.bottomsheets.BottomSheet$a:
+com.afollestad.materialdialogs.bottomsheets.BottomSheet$hideButtons$1 -> com.afollestad.materialdialogs.bottomsheets.BottomSheet$hideButtons$1:
+    android.animation.Animator $animator -> a
+    void invoke(com.afollestad.materialdialogs.internal.button.DialogActionButtonLayout) -> a
+com.afollestad.materialdialogs.bottomsheets.BottomSheet$hideButtons$animator$1 -> com.afollestad.materialdialogs.bottomsheets.BottomSheet$hideButtons$animator$1:
+    com.afollestad.materialdialogs.bottomsheets.BottomSheet this$0 -> a
+    void invoke(int) -> a
+com.afollestad.materialdialogs.bottomsheets.BottomSheet$onPreShow$1 -> com.afollestad.materialdialogs.bottomsheets.BottomSheet$b:
+    com.afollestad.materialdialogs.bottomsheets.BottomSheet this$0 -> a
+com.afollestad.materialdialogs.bottomsheets.BottomSheet$onPreShow$2 -> com.afollestad.materialdialogs.bottomsheets.BottomSheet$onPreShow$2:
+    com.afollestad.materialdialogs.bottomsheets.BottomSheet this$0 -> a
+    void invoke(android.view.ViewGroup) -> a
+com.afollestad.materialdialogs.bottomsheets.BottomSheet$onPreShow$2$1 -> com.afollestad.materialdialogs.bottomsheets.BottomSheet$onPreShow$2$1:
+    com.afollestad.materialdialogs.bottomsheets.BottomSheet$onPreShow$2 this$0 -> a
+    java.lang.Object invoke() -> b
+    void invoke() -> b
+com.afollestad.materialdialogs.bottomsheets.BottomSheet$setupBottomSheetBehavior$2 -> com.afollestad.materialdialogs.bottomsheets.BottomSheet$setupBottomSheetBehavior$2:
+    com.afollestad.materialdialogs.bottomsheets.BottomSheet this$0 -> a
+    void invoke(int) -> a
+com.afollestad.materialdialogs.bottomsheets.BottomSheet$setupBottomSheetBehavior$3 -> com.afollestad.materialdialogs.bottomsheets.BottomSheet$setupBottomSheetBehavior$3:
+    com.afollestad.materialdialogs.bottomsheets.BottomSheet this$0 -> a
+    java.lang.Object invoke() -> b
+    void invoke() -> b
+com.afollestad.materialdialogs.bottomsheets.BottomSheet$setupBottomSheetBehavior$4 -> com.afollestad.materialdialogs.bottomsheets.BottomSheet$setupBottomSheetBehavior$4:
+    com.afollestad.materialdialogs.bottomsheets.BottomSheet this$0 -> a
+    void invoke(android.view.ViewGroup) -> a
+com.afollestad.materialdialogs.bottomsheets.BottomSheet$showButtons$1 -> com.afollestad.materialdialogs.bottomsheets.BottomSheet$showButtons$1:
+    android.animation.Animator $animator -> a
+    void invoke(com.afollestad.materialdialogs.internal.button.DialogActionButtonLayout) -> a
+com.afollestad.materialdialogs.bottomsheets.BottomSheet$showButtons$animator$1 -> com.afollestad.materialdialogs.bottomsheets.BottomSheet$showButtons$animator$1:
+    com.afollestad.materialdialogs.bottomsheets.BottomSheet this$0 -> a
+    void invoke(int) -> a
+com.afollestad.materialdialogs.bottomsheets.GridIconDialogAdapter -> com.afollestad.materialdialogs.bottomsheets.GridIconDialogAdapter:
+    java.util.List items -> c
+    int[] disabledIndices -> a
+    com.afollestad.materialdialogs.MaterialDialog dialog -> b
+    boolean waitForPositiveButton -> d
+    kotlin.jvm.functions.Function3 selection -> e
+    void itemClicked(int) -> a
+    void onBindViewHolder(com.afollestad.materialdialogs.bottomsheets.GridItemViewHolder,int) -> a
+    void positiveButtonClicked() -> a
+com.afollestad.materialdialogs.bottomsheets.GridItem -> com.afollestad.materialdialogs.bottomsheets.a:
+    void populateIcon(android.widget.ImageView) -> a
+com.afollestad.materialdialogs.bottomsheets.GridItemViewHolder -> com.afollestad.materialdialogs.bottomsheets.GridItemViewHolder:
+    android.widget.TextView titleView -> b
+    com.afollestad.materialdialogs.bottomsheets.GridIconDialogAdapter adapter -> c
+    android.widget.ImageView iconView -> a
+    android.widget.ImageView getIconView() -> a
+    android.widget.TextView getTitleView() -> b
+com.afollestad.materialdialogs.bottomsheets.UtilKt -> com.afollestad.materialdialogs.bottomsheets.UtilKt:
+    void animatePeekHeight(com.google.android.material.bottomsheet.BottomSheetBehavior,android.view.View,int,int,long,kotlin.jvm.functions.Function0) -> a
+    android.animation.Animator animateValues(int,int,long,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function0) -> a
+    android.animation.Animator animateValues$default(int,int,long,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function0,int,java.lang.Object) -> a
+    void onDetach(android.view.View,kotlin.jvm.functions.Function1) -> a
+    void setCallbacks(com.google.android.material.bottomsheet.BottomSheetBehavior,kotlin.jvm.functions.Function1,kotlin.jvm.functions.Function0) -> a
+com.afollestad.materialdialogs.bottomsheets.UtilKt$animatePeekHeight$2 -> com.afollestad.materialdialogs.bottomsheets.UtilKt$animatePeekHeight$2:
+    android.animation.Animator $animator -> a
+    void invoke(android.view.View) -> a
+com.afollestad.materialdialogs.bottomsheets.UtilKt$animatePeekHeight$animator$1 -> com.afollestad.materialdialogs.bottomsheets.UtilKt$animatePeekHeight$animator$1:
+    void invoke(int) -> a
+    kotlin.reflect.KDeclarationContainer getOwner() -> i
+    java.lang.String getSignature() -> k
+com.afollestad.materialdialogs.bottomsheets.UtilKt$animateValues$$inlined$apply$lambda$1 -> com.afollestad.materialdialogs.bottomsheets.UtilKt$a:
+    kotlin.jvm.functions.Function1 $onUpdate$inlined -> a
+com.afollestad.materialdialogs.bottomsheets.UtilKt$animateValues$$inlined$apply$lambda$2 -> com.afollestad.materialdialogs.bottomsheets.UtilKt$b:
+    kotlin.jvm.functions.Function0 $onEnd$inlined -> a
+com.afollestad.materialdialogs.bottomsheets.UtilKt$animateValues$1 -> com.afollestad.materialdialogs.bottomsheets.UtilKt$animateValues$1:
+    com.afollestad.materialdialogs.bottomsheets.UtilKt$animateValues$1 INSTANCE -> a
+    java.lang.Object invoke() -> b
+    void invoke() -> b
+com.afollestad.materialdialogs.bottomsheets.UtilKt$onDetach$1 -> com.afollestad.materialdialogs.bottomsheets.UtilKt$c:
+    android.view.View $this_onDetach -> a
+    kotlin.jvm.functions.Function1 $onAttached -> b
+com.afollestad.materialdialogs.bottomsheets.UtilKt$setCallbacks$1 -> com.afollestad.materialdialogs.bottomsheets.UtilKt$d:
+    com.google.android.material.bottomsheet.BottomSheetBehavior $this_setCallbacks -> a
+    kotlin.jvm.functions.Function1 $onSlide -> b
+    kotlin.jvm.functions.Function0 $onHide -> c
 com.afollestad.materialdialogs.callbacks.DialogCallbackExtKt -> com.afollestad.materialdialogs.f.a:
     void invokeAll(java.util.List,com.afollestad.materialdialogs.MaterialDialog) -> a
     com.afollestad.materialdialogs.MaterialDialog onDismiss(com.afollestad.materialdialogs.MaterialDialog,kotlin.jvm.functions.Function1) -> a
@@ -1239,6 +1355,7 @@ com.afollestad.materialdialogs.internal.main.DialogLayout -> com.afollestad.mate
     int frameMarginVerticalLess -> e
     boolean debugMode -> b
     int maxHeight -> a
+    void attachButtonsLayout(com.afollestad.materialdialogs.internal.button.DialogActionButtonLayout) -> a
     void attachDialog(com.afollestad.materialdialogs.MaterialDialog) -> a
     void box(android.graphics.Canvas,int,float,float,float,float,float) -> a
     void horizontalLine(android.graphics.Canvas,int,float,float) -> a
@@ -1352,9 +1469,14 @@ com.afollestad.materialdialogs.utils.MDUtil -> com.afollestad.materialdialogs.j.
     java.lang.CharSequence resolveString$default(com.afollestad.materialdialogs.utils.MDUtil,com.afollestad.materialdialogs.MaterialDialog,java.lang.Integer,java.lang.Integer,boolean,int,java.lang.Object) -> a
     void updatePadding(android.view.View,int,int,int,int) -> a
     void updatePadding$default(com.afollestad.materialdialogs.utils.MDUtil,android.view.View,int,int,int,int,int,java.lang.Object) -> a
-    void waitForWidth(android.view.View,kotlin.jvm.functions.Function1) -> a
+    void waitForHeight(android.view.View,kotlin.jvm.functions.Function1) -> a
     int resolveInt(android.content.Context,int,int) -> b
-com.afollestad.materialdialogs.utils.MDUtil$waitForWidth$1 -> com.afollestad.materialdialogs.j.e$a:
+    void waitForWidth(android.view.View,kotlin.jvm.functions.Function1) -> b
+com.afollestad.materialdialogs.utils.MDUtil$waitForHeight$1 -> com.afollestad.materialdialogs.j.e$a:
+    android.view.View $this_waitForHeight -> b
+    java.lang.Integer lastHeight -> a
+    kotlin.jvm.functions.Function1 $block -> c
+com.afollestad.materialdialogs.utils.MDUtil$waitForWidth$1 -> com.afollestad.materialdialogs.j.e$b:
     android.view.View $this_waitForWidth -> b
     java.lang.Integer lastWidth -> a
     kotlin.jvm.functions.Function1 $block -> c
@@ -8324,15 +8446,15 @@ me.hegj.wandroid.mvp.ui.activity.main.me.MeFragment$Companion -> me.hegj.wandroi
 me.hegj.wandroid.mvp.ui.activity.main.me.MeFragment$initData$$inlined$run$lambda$1 -> me.hegj.wandroid.mvp.ui.activity.main.me.MeFragment$b:
     me.hegj.wandroid.mvp.ui.activity.main.me.MeFragment this$0 -> a
 me.hegj.wandroid.mvp.ui.activity.main.me.MeFragment_ViewBinding -> me.hegj.wandroid.mvp.ui.activity.main.me.MeFragment_ViewBinding:
-    android.view.View view7f090133 -> i
-    android.view.View view7f090139 -> h
+    android.view.View view7f090137 -> i
+    android.view.View view7f09013d -> h
     me.hegj.wandroid.mvp.ui.activity.main.me.MeFragment target -> a
-    android.view.View view7f090135 -> c
-    android.view.View view7f09013c -> b
-    android.view.View view7f09013e -> e
-    android.view.View view7f09013a -> d
-    android.view.View view7f090134 -> g
-    android.view.View view7f090138 -> f
+    android.view.View view7f090139 -> c
+    android.view.View view7f090140 -> b
+    android.view.View view7f090142 -> e
+    android.view.View view7f09013e -> d
+    android.view.View view7f090138 -> g
+    android.view.View view7f09013c -> f
 me.hegj.wandroid.mvp.ui.activity.main.me.MeFragment_ViewBinding$1 -> me.hegj.wandroid.mvp.ui.activity.main.me.MeFragment_ViewBinding$a:
     me.hegj.wandroid.mvp.ui.activity.main.me.MeFragment val$target -> a
 me.hegj.wandroid.mvp.ui.activity.main.me.MeFragment_ViewBinding$2 -> me.hegj.wandroid.mvp.ui.activity.main.me.MeFragment_ViewBinding$b:
@@ -8868,7 +8990,7 @@ me.hegj.wandroid.mvp.ui.activity.share.ShareAriticleActivity$onViewClicked$$inli
     void invoke(com.afollestad.materialdialogs.MaterialDialog) -> a
 me.hegj.wandroid.mvp.ui.activity.share.ShareAriticleActivity_ViewBinding -> me.hegj.wandroid.mvp.ui.activity.share.ShareAriticleActivity_ViewBinding:
     me.hegj.wandroid.mvp.ui.activity.share.ShareAriticleActivity target -> a
-    android.view.View view7f0901b2 -> b
+    android.view.View view7f0901b8 -> b
 me.hegj.wandroid.mvp.ui.activity.share.ShareAriticleActivity_ViewBinding$1 -> me.hegj.wandroid.mvp.ui.activity.share.ShareAriticleActivity_ViewBinding$a:
     me.hegj.wandroid.mvp.ui.activity.share.ShareAriticleActivity val$target -> a
 me.hegj.wandroid.mvp.ui.activity.share.ShareByIdActivity -> me.hegj.wandroid.mvp.ui.activity.share.ShareByIdActivity:
@@ -8995,9 +9117,9 @@ me.hegj.wandroid.mvp.ui.activity.start.LoginActivity$initData$4 -> me.hegj.wandr
     me.hegj.wandroid.mvp.ui.activity.start.LoginActivity this$0 -> a
 me.hegj.wandroid.mvp.ui.activity.start.LoginActivity_ViewBinding -> me.hegj.wandroid.mvp.ui.activity.start.LoginActivity_ViewBinding:
     me.hegj.wandroid.mvp.ui.activity.start.LoginActivity target -> a
-    android.view.View view7f09011a -> c
-    android.view.View view7f090116 -> b
-    android.view.View view7f090117 -> d
+    android.view.View view7f09011b -> c
+    android.view.View view7f090117 -> b
+    android.view.View view7f090118 -> d
 me.hegj.wandroid.mvp.ui.activity.start.LoginActivity_ViewBinding$1 -> me.hegj.wandroid.mvp.ui.activity.start.LoginActivity_ViewBinding$a:
     me.hegj.wandroid.mvp.ui.activity.start.LoginActivity val$target -> a
 me.hegj.wandroid.mvp.ui.activity.start.LoginActivity_ViewBinding$2 -> me.hegj.wandroid.mvp.ui.activity.start.LoginActivity_ViewBinding$b:
@@ -9024,9 +9146,9 @@ me.hegj.wandroid.mvp.ui.activity.start.RegisterActivity$initData$5 -> me.hegj.wa
 me.hegj.wandroid.mvp.ui.activity.start.RegisterActivity$initData$6 -> me.hegj.wandroid.mvp.ui.activity.start.RegisterActivity$f:
     me.hegj.wandroid.mvp.ui.activity.start.RegisterActivity this$0 -> a
 me.hegj.wandroid.mvp.ui.activity.start.RegisterActivity_ViewBinding -> me.hegj.wandroid.mvp.ui.activity.start.RegisterActivity_ViewBinding:
-    android.view.View view7f090186 -> c
+    android.view.View view7f09018b -> c
     me.hegj.wandroid.mvp.ui.activity.start.RegisterActivity target -> a
-    android.view.View view7f090181 -> b
+    android.view.View view7f090186 -> b
 me.hegj.wandroid.mvp.ui.activity.start.RegisterActivity_ViewBinding$1 -> me.hegj.wandroid.mvp.ui.activity.start.RegisterActivity_ViewBinding$a:
     me.hegj.wandroid.mvp.ui.activity.start.RegisterActivity val$target -> a
 me.hegj.wandroid.mvp.ui.activity.start.RegisterActivity_ViewBinding$2 -> me.hegj.wandroid.mvp.ui.activity.start.RegisterActivity_ViewBinding$b:

app/release/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":7,"versionName":"1.0.6","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":8,"versionName":"1.0.7","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

app/src/main/java/me/hegj/wandroid/app/AppLifecyclesImpl.kt

@@ -81,8 +81,8 @@ class AppLifecyclesImpl : AppLifecycles {
         val strategy = UserStrategy(context)
         strategy.isUploadProcess = processName == null || processName == packageName
         // 初始化Bugly
-        Bugly.init(context, "xxx", BuildConfig.DEBUG)
-
+        Bugly.init(context, BuildConfig.BUGLY_KE, BuildConfig.DEBUG)
+        //防止项目崩溃，崩溃后打开错误界面
         CaocConfig.Builder.create()
                 .backgroundMode(CaocConfig.BACKGROUND_MODE_SILENT) //default: CaocConfig.BACKGROUND_MODE_SHOW_CUSTOM
                 .enabled(true)//是否启用CustomActivityOnCrash崩溃拦截机制 必须启用！不然集成这个库干啥？？？

app/src/main/java/me/hegj/wandroid/app/utils/CustomHandleSubscriber.java

@@ -1,42 +0,0 @@
-package me.hegj.wandroid.app.utils;
-
-import io.reactivex.Observer;
-import io.reactivex.annotations.NonNull;
-import io.reactivex.disposables.Disposable;
-import me.jessyan.rxerrorhandler.core.RxErrorHandler;
-import me.jessyan.rxerrorhandler.handler.ErrorHandlerFactory;
-
-public abstract class CustomHandleSubscriber<T> implements Observer<T> {
-    private ErrorHandlerFactory mHandlerFactory;
-
-    public CustomHandleSubscriber(RxErrorHandler rxErrorHandler){
-        this.mHandlerFactory = rxErrorHandler.getHandlerFactory();
-    }
-
-
-    @Override
-    public void onSubscribe(@NonNull Disposable d) {
-
-    }
-
-
-    @Override
-    public void onComplete() {
-
-    }
-
-    @Override
-    public void onNext(T t) {
-        onReturNext(t);
-    }
-    public T onReturNext(T t){
-        return t;
-    }
-    @Override
-    public void onError(@NonNull Throwable t) {
-        t.printStackTrace();
-        //如果你某个地方不想使用全局错误处理,则重写 onError(Throwable) 并将 super.onError(e); 删掉
-        //如果你不仅想使用全局错误处理,还想加入自己的逻辑,则重写 onError(Throwable) 并在 super.onError(e); 后面加入自己的逻辑
-        mHandlerFactory.handleError(t);
-    }
-}

app/src/main/java/me/hegj/wandroid/app/utils/GridDividerItemDecoration.java

@@ -13,12 +13,12 @@ import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 
 /**
- * Created by Haozi on 2018/10/10 0023.
+  * @Author:         hegaojian
+  * @CreateDate:     2019/10/11 14:29
  */
-
 public class GridDividerItemDecoration extends RecyclerView.ItemDecoration {
     private Paint mPaint;
-    private int mDividerWidth;          //您所需指定的间隔宽度，主要为第一列和最后一列与父控件的间隔；行间距，列间距将动态分配
+    private int mDividerWidth;//您所需指定的间隔宽度，主要为第一列和最后一列与父控件的间隔；行间距，列间距将动态分配
     private int mFirstRowTopMargin = 0; //第一行顶部是否需要间隔
     private boolean isNeedSpace = false;//第一列和最后一列是否需要指定间隔(默认不指定)
     private boolean isLastRowNeedSpace = false;//最后一行是否需要间隔(默认不需要)

app/src/main/java/me/hegj/wandroid/app/utils/ShowUtils.kt

@@ -13,6 +13,7 @@ import android.widget.Toast
 import com.afollestad.materialdialogs.MaterialDialog
 import me.hegj.wandroid.R
 
+
 object ShowUtils {
     private var dialog: ProgressDialog? = null
     private var toast: Toast? = null
@@ -100,7 +101,6 @@ object ShowUtils {
                 show()
             }
         }
-
     }
 
     /**

app/src/main/java/me/hegj/wandroid/app/weight/DefineLoadMoreView.kt

@@ -91,7 +91,6 @@ class DefineLoadMoreView(context: Context) : LinearLayout(context), SwipeRecycle
      */
     override fun onWaitToLoadMore(loadMoreListener: SwipeRecyclerView.LoadMoreListener) {
         this.mLoadMoreListener = loadMoreListener
-
         visibility = View.VISIBLE
         mProgressBar.visibility = View.GONE
         mTvMessage.visibility = View.VISIBLE
@@ -119,9 +118,10 @@ class DefineLoadMoreView(context: Context) : LinearLayout(context), SwipeRecycle
      */
     @SuppressLint("LogNotTimber")
     override fun onClick(v: View) {
-        //为什么加后面那个判断，因为Wandroid第0页能够请求完所有数据的情况下， 再去请求第1页 也能取到值，所以这里要判断没有更多数据的时候禁止在响应点击事件了
+        //为什么加后面那个判断，因为Wandroid第0页能够请求完所有数据的情况下， 再去请求第1页 也能取到值，
+        // 所以这里要判断没有更多数据的时候禁止在响应点击事件了,同时在加载中时也不能触发加载更多的监听
         mLoadMoreListener?.let {
-            if (mTvMessage.text != "没有更多数据啦"){
+            if (mTvMessage.text != "没有更多数据啦"&&mProgressBar.visibility!=View.VISIBLE){
                 it.onLoadMore()
             }
         }

app/src/main/java/me/hegj/wandroid/app/weight/LollipopFixedWebView.kt

@@ -0,0 +1,30 @@
+package me.hegj.wandroid.app.weight
+
+import android.annotation.TargetApi
+import android.content.Context
+import android.content.res.Configuration
+import android.os.Build
+import android.util.AttributeSet
+import android.webkit.WebView
+
+/**
+ * 自定义webview 解决5.1手机打开网页闪退的bug
+ * @Author:         hegaojian
+ * @CreateDate:     2019/10/11 14:23
+ */
+class LollipopFixedWebView : WebView {
+    constructor(context: Context) : super(getFixedContext(context))
+    constructor(context: Context, attrs: AttributeSet) : super(getFixedContext(context), attrs)
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(getFixedContext(context), attrs, defStyleAttr)
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(getFixedContext(context), attrs, defStyleAttr, defStyleRes)
+
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int, privateBrowsing: Boolean) : super(getFixedContext(context), attrs, defStyleAttr, privateBrowsing)
+
+    companion object {
+        fun getFixedContext(context: Context): Context {
+            return context.createConfigurationContext(Configuration())
+        }
+    }
+
+}

app/src/main/java/me/hegj/wandroid/mvp/ui/activity/error/ErrorActivity.kt

@@ -40,7 +40,7 @@ class ErrorActivity : BaseActivity<IPresenter>() {
             // 创建普通字符型ClipData
             val mClipData = ClipData.newPlainText("Label", CustomActivityOnCrash.getStackTraceFromIntent(intent))
             // 将ClipData内容放到系统剪贴板里。
-            cm.primaryClip = mClipData
+            cm.setPrimaryClip(mClipData)
             ShowUtils.showToast(this, "已复制错误日志到粘贴板")
             ShowUtils.showDialog(this, "扣　扣：824868922\n\n微　信：hgj840\n\n邮　箱：824868922@qq.com", "联系我")
         }

app/src/main/java/me/hegj/wandroid/mvp/ui/activity/integral/IntegralActivity.kt

@@ -7,6 +7,7 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.widget.TextView
+import androidx.preference.Preference
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.jess.arms.di.component.AppComponent
@@ -19,6 +20,7 @@ import kotlinx.android.synthetic.main.include_toolbar.*
 import me.hegj.wandroid.R
 import me.hegj.wandroid.app.utils.RecyclerViewUtils
 import me.hegj.wandroid.app.utils.SettingUtil
+import me.hegj.wandroid.app.utils.ShowUtils
 import me.hegj.wandroid.app.weight.DefineLoadMoreView
 import me.hegj.wandroid.app.weight.loadCallBack.EmptyCallback
 import me.hegj.wandroid.app.weight.loadCallBack.ErrorCallback
@@ -27,10 +29,12 @@ import me.hegj.wandroid.di.component.integral.DaggerIntegralComponent
 import me.hegj.wandroid.di.module.integral.IntegralModule
 import me.hegj.wandroid.mvp.contract.integral.IntegralContract
 import me.hegj.wandroid.mvp.model.entity.ApiPagerResponse
+import me.hegj.wandroid.mvp.model.entity.BannerResponse
 import me.hegj.wandroid.mvp.model.entity.IntegralHistoryResponse
 import me.hegj.wandroid.mvp.model.entity.IntegralResponse
 import me.hegj.wandroid.mvp.presenter.integral.IntegralPresenter
 import me.hegj.wandroid.mvp.ui.BaseActivity
+import me.hegj.wandroid.mvp.ui.activity.web.WebviewActivity
 import me.hegj.wandroid.mvp.ui.adapter.IntegralAdapter
 
 
@@ -89,7 +93,7 @@ class IntegralActivity : BaseActivity<IntegralPresenter>(), IntegralContract.Vie
             integral?.run {
                 myRank = rank
                 integral_mename.text = username
-                integral_merank.text = if (rank > 999) "999+" else rank.toString()
+                integral_merank.text = rank.toString()
                 integral_mecount.text = coinCount.toString()
                 SettingUtil.getColor(this@IntegralActivity).let {
                     integral_mename.setTextColor(it)
@@ -209,6 +213,14 @@ class IntegralActivity : BaseActivity<IntegralPresenter>(), IntegralContract.Vie
 
     override fun onOptionsItemSelected(item: MenuItem?): Boolean {
         when (item?.itemId) {
+            R.id.integral_guize ->{
+                val data = BannerResponse("", 0, "", 0, 0, "积分规则", 0, "https://www.wanandroid.com/blog/show/2653")
+                launchActivity(Intent(this, WebviewActivity::class.java).apply {
+                    putExtras(Bundle().apply {
+                        putSerializable("bannerdata", data)
+                    })
+                })
+            }
             R.id.integral_history -> {
                 launchActivity(Intent(this, IntegralHistoryActivity::class.java))
             }

app/src/main/java/me/hegj/wandroid/mvp/ui/activity/main/home/HomeFragment.kt

@@ -31,7 +31,6 @@ import me.hegj.wandroid.app.event.LoginFreshEvent
 import me.hegj.wandroid.app.event.SettingChangeEvent
 import me.hegj.wandroid.app.utils.RecyclerViewUtils
 import me.hegj.wandroid.app.utils.SettingUtil
-import me.hegj.wandroid.app.utils.ShowUtils
 import me.hegj.wandroid.app.weight.CollectView
 import me.hegj.wandroid.app.weight.DefineLoadMoreView
 import me.hegj.wandroid.app.weight.loadCallBack.EmptyCallback
@@ -107,7 +106,6 @@ class HomeFragment : BaseFragment<HomePresenter>(), HomeContract.View {
         super.initData(savedInstanceState)
         toolbar.run {
             setBackgroundColor(SettingUtil.getColor(_mActivity))
-            //当前时间时间没有超过10月7号，使用国庆主题
             title = "首页"
             inflateMenu(R.menu.home_menu)
             setOnMenuItemClickListener {

app/src/main/java/me/hegj/wandroid/mvp/ui/activity/setting/GeneralPreferenceFragment.kt

@@ -25,7 +25,6 @@ import me.hegj.wandroid.mvp.ui.activity.web.WebviewActivity
 
 class GeneralPreferenceFragment : PreferenceFragmentCompat(), SharedPreferences.OnSharedPreferenceChangeListener {
 
-
     private var colorPreview: IconPreference? = null
     private lateinit var parentActivity: SettingActivity
 

app/src/main/java/me/hegj/wandroid/mvp/ui/activity/setting/OpenProjectActivity.kt

@@ -20,8 +20,11 @@ import net.lucode.hackware.magicindicator.buildins.UIUtil
 
 @SuppressLint("Registered")
 class OpenProjectActivity : BaseActivity<IPresenter>() {
+
     lateinit var openAdapter: OpenProjectAdapter
+
     var openData: ArrayList<OpenProject> = arrayListOf()
+
     override fun setupActivityComponent(appComponent: AppComponent) {}
 
     override fun initView(savedInstanceState: Bundle?): Int {
@@ -35,7 +38,9 @@ class OpenProjectActivity : BaseActivity<IPresenter>() {
             setNavigationIcon(R.drawable.ic_back)
             setNavigationOnClickListener { finish() }
         }
+
         getOpenData()
+
         openAdapter = OpenProjectAdapter(openData).apply {
             if (SettingUtil.getListMode(this@OpenProjectActivity) != 0) {
                 openLoadAnimation(SettingUtil.getListMode(this@OpenProjectActivity))

app/src/main/java/me/hegj/wandroid/mvp/ui/activity/share/ShareAriticleActivity.kt

@@ -1,9 +1,14 @@
 package me.hegj.wandroid.mvp.ui.activity.share
 
+import android.content.Intent
 import android.os.Bundle
+import android.view.Menu
+import android.view.MenuItem
 import android.view.View
 import butterknife.OnClick
 import com.afollestad.materialdialogs.MaterialDialog
+import com.afollestad.materialdialogs.bottomsheets.BottomSheet
+import com.afollestad.materialdialogs.customview.customView
 import com.jess.arms.di.component.AppComponent
 import kotlinx.android.synthetic.main.activity_share_ariticle.*
 import kotlinx.android.synthetic.main.include_recyclerview.*
@@ -16,9 +21,12 @@ import me.hegj.wandroid.app.utils.SettingUtil
 import me.hegj.wandroid.di.component.share.DaggerShareAriticleComponent
 import me.hegj.wandroid.di.module.share.ShareAriticleModule
 import me.hegj.wandroid.mvp.contract.share.ShareAriticleContract
+import me.hegj.wandroid.mvp.model.entity.BannerResponse
 import me.hegj.wandroid.mvp.model.entity.UserInfoResponse
 import me.hegj.wandroid.mvp.presenter.share.ShareAriticlePresenter
 import me.hegj.wandroid.mvp.ui.BaseActivity
+import me.hegj.wandroid.mvp.ui.activity.integral.IntegralHistoryActivity
+import me.hegj.wandroid.mvp.ui.activity.web.WebviewActivity
 import org.greenrobot.eventbus.Subscribe
 
 /**
@@ -81,4 +89,23 @@ class ShareAriticleActivity : BaseActivity<ShareAriticlePresenter>(), ShareAriti
         finish()
     }
 
+    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+        menuInflater.inflate(R.menu.share_menu, menu)
+        return super.onCreateOptionsMenu(menu)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
+        when (item?.itemId) {
+            R.id.share_guize ->{
+                MaterialDialog(this,BottomSheet()).show {
+                    title(text = "温馨提示")
+                    customView(R.layout.customview,scrollable = true,horizontalPadding = true)
+                    positiveButton(text = "知道了")
+                    cornerRadius(16f)
+                }
+            }
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
 }

app/src/main/java/me/hegj/wandroid/mvp/ui/activity/web/WebviewActivity.kt

@@ -15,13 +15,11 @@ import com.jess.arms.integration.AppManager
 import com.just.agentweb.AgentWeb
 import kotlinx.android.synthetic.main.activity_webview.*
 import kotlinx.android.synthetic.main.include_toolbar.*
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.async
-import kotlinx.coroutines.launch
 import me.hegj.wandroid.R
 import me.hegj.wandroid.app.event.CollectEvent
 import me.hegj.wandroid.app.event.LoginFreshEvent
 import me.hegj.wandroid.app.utils.CacheUtil
+import me.hegj.wandroid.app.weight.LollipopFixedWebView
 import me.hegj.wandroid.di.component.web.DaggerWebviewComponent
 import me.hegj.wandroid.di.module.web.WebviewModule
 import me.hegj.wandroid.mvp.contract.web.WebviewContract
@@ -30,7 +28,6 @@ import me.hegj.wandroid.mvp.model.entity.BannerResponse
 import me.hegj.wandroid.mvp.model.entity.CollectResponse
 import me.hegj.wandroid.mvp.model.entity.CollectUrlResponse
 import me.hegj.wandroid.mvp.model.entity.enums.CollectType
-import me.hegj.wandroid.mvp.model.entity.enums.TodoType
 import me.hegj.wandroid.mvp.presenter.web.WebviewPresenter
 import me.hegj.wandroid.mvp.ui.BaseActivity
 import me.hegj.wandroid.mvp.ui.activity.start.LoginActivity
@@ -111,6 +108,7 @@ class WebviewActivity : BaseActivity<WebviewPresenter>(), WebviewContract.View {
         mAgentWeb = AgentWeb.with(this)
                 .setAgentWebParent(webview_content, LinearLayout.LayoutParams(-1, -1))
                 .useDefaultIndicator()
+                .setWebView(LollipopFixedWebView(this))
                 .createAgentWeb()
                 .ready()
                 .go(url)

app/src/main/res/layout/customview.xml

@@ -0,0 +1,18 @@
+<?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="wrap_content"
+    android:orientation="vertical">
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="15dp"
+        android:textColor="@color/colorBlack666"
+        android:lineSpacingMultiplier="1.5"
+        android:text="1. 只要是任何好文都可以分享哈，并不一定要是原创！投递的文章会进入广场 tab;\n
+2. CSDN，掘金，简书等官方博客站点会直接通过，不需要审核;\n
+3. 其他个人站点会进入审核阶段，不要投递任何无效链接，测试的请尽快删除，否则可能会对你的账号产生一定影响;\n
+4. 目前处于测试阶段，如果你发现500等错误，可以向我提交日志，让我们一起使网站变得更好。\n
+5. 由于本站只有我一个人开发与维护，会尽力保证24小时内审核，当然有可能哪天太累，会延期，请保持佛系...\n"
+        />
+</LinearLayout>

app/src/main/res/layout/fragment_me.xml

@@ -12,6 +12,7 @@
         android:orientation="vertical">
 
         <include layout="@layout/include_toolbar" />
+
         <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -60,7 +61,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginStart="16dp"
                         android:layout_marginTop="12dp"
-                        android:text="id : 17　排名 : 2"
+                        android:text="id : --　排名 : --"
                         android:textColor="@color/white"
                         android:textSize="12dp"
                         app:layout_constraintBottom_toBottomOf="@+id/imageView"

app/src/main/res/layout/item_ariticle.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView 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="wrap_content"
     android:layout_marginLeft="8dp"

app/src/main/res/layout/item_share_ariticle.xml

@@ -34,13 +34,14 @@
 
         <ImageView
             android:id="@+id/item_share_del"
-            android:layout_width="18dp"
-            android:layout_height="18dp"
+            android:layout_width="28dp"
+            android:layout_height="28dp"
             android:layout_marginEnd="16dp"
             android:layout_marginRight="16dp"
             android:src="@drawable/ic_delete"
             android:background="@drawable/item_imgselector"
             android:scaleType="fitXY"
+            android:padding="6dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />

app/src/main/res/menu/integral_menu.xml

@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/integral_guize"
+        android:checked="false"
+        android:title="积分规则"
+        android:icon="@drawable/ic_guize"
+        app:showAsAction="always" />
     <item
         android:id="@+id/integral_history"
         android:checked="false"

app/src/main/res/menu/share_menu.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/share_guize"
+        android:checked="false"
+        android:title="分享规则"
+        android:icon="@drawable/ic_guize"
+        app:showAsAction="always" />
+</menu>

app/src/main/res/menu/todoclick_menu.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/todo_update"
-        android:title="@string/todo_update" />
-    <item
-        android:id="@+id/todo_delete"
-        android:title="@string/todo_delete" />
-    <item
-        android:id="@+id/todo_confirm"
-        android:title="@string/todo_confirm" />
-</menu>

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:3.5.1'
         //Gradle Android Maven plugin
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

config.gradle

@@ -1,12 +1,12 @@
 ext {
 
     android = [
-            compileSdkVersion: 28,
-            buildToolsVersion: "28.0.3",
+            compileSdkVersion: 29,
+            buildToolsVersion: "29.0.2",
             minSdkVersion    : 21,
-            targetSdkVersion : 28,
-            versionCode      : 7,
-            versionName      : "1.0.6"
+            targetSdkVersion : 29,
+            versionCode      : 8,
+            versionName      : "1.0.7"
     ]
 
     version = [
@@ -118,6 +118,7 @@ ext {
             "dialogs-core"          : 'com.afollestad.material-dialogs:core:3.1.1',
             "dialogs-color"         : 'com.afollestad.material-dialogs:color:3.1.1',
             "dialogs-datetime"      : 'com.afollestad.material-dialogs:datetime:3.1.1',
+            "dialogs-bottomsheets"  : 'com.afollestad.material-dialogs:bottomsheets:3.1.1',
             //fragment管理库
             "fragmentationx"        : 'me.yokeyword:fragmentationx:1.0.1',
             //底部导航栏