Browse Source

:heart_eyes::heart_eyes::heart_eyes:为祖国母亲庆生,添加国庆主题

hegj 5 years ago
parent
commit
81071b91cb

+ 68 - 326
app/priguardMapping.txt

@@ -332,17 +332,6 @@ cn.bingoogolapple.bgabanner.transformer.ZoomStackPageTransformer -> cn.bingoogol
     void handleInvisiblePage(android.view.View,float) -> a
     void handleLeftPage(android.view.View,float) -> b
     void handleRightPage(android.view.View,float) -> c
-cn.simonlee.widget.swipeback.ShadowView -> cn.simonlee.widget.swipeback.ShadowView:
-    int[] colors -> f
-    float[] positions -> g
-    android.graphics.Paint mShadowBarPaint -> b
-    boolean isShowShadowBar -> e
-    int mShadowColor -> d
-    float density -> a
-    int mLinearShaderWidth -> c
-    int getShadowAlpha(float) -> a
-    float getShadowPosition(int) -> a
-    void setShowColor(int,boolean,boolean) -> a
 com.afollestad.date.CalendarsKt -> com.afollestad.date.a:
     java.util.Calendar decrementMonth(java.util.Calendar) -> a
     void setDayOfMonth(java.util.Calendar,int) -> a
@@ -1434,218 +1423,6 @@ com.afollestad.viewpagerdots.DotsIndicator$internalPageChangeListener$1 -> com.a
     com.afollestad.viewpagerdots.DotsIndicator this$0 -> a
 com.afollestad.viewpagerdots.UtilKt -> com.afollestad.viewpagerdots.a:
     android.graphics.drawable.Drawable tint(android.graphics.drawable.Drawable,int) -> a
-com.billy.android.swipe.SmartSwipe -> com.billy.android.swipe.a:
-    com.billy.android.swipe.SmartSwipe$IWrapperFactory factory -> a
-    int dp2px(int,android.content.Context) -> a
-    float ensureBetween(float,float,float) -> a
-    int ensureBetween(int,int,int) -> a
-    boolean initFactoryByClassName(java.lang.String) -> a
-    void setFactory(com.billy.android.swipe.SmartSwipe$IWrapperFactory) -> a
-com.billy.android.swipe.SmartSwipe$IWrapperFactory -> com.billy.android.swipe.a$a:
-com.billy.android.swipe.SmartSwipeRefresh$RefreshView -> com.billy.android.swipe.b:
-com.billy.android.swipe.SmartSwipeRefresh$SmartSwipeRefreshFooter -> com.billy.android.swipe.c:
-com.billy.android.swipe.SmartSwipeRefresh$SmartSwipeRefreshHeader -> com.billy.android.swipe.d:
-com.billy.android.swipe.SmartSwipeWrapper$LayoutParams -> com.billy.android.swipe.SmartSwipeWrapper$a:
-    int gravity -> a
-com.billy.android.swipe.SwipeConsumer -> com.billy.android.swipe.f:
-    boolean mSwiping -> m
-    com.billy.android.swipe.internal.SwipeHelper mSwipeHelper -> n
-    int mCurDisplayDistanceX -> j
-    int mSwipeOpenDistance -> h
-    int mCurSwipeDistanceX -> f
-    int mCachedSwipeDistanceX -> d
-    int mWidth -> C
-    com.billy.android.swipe.SmartSwipeWrapper mWrapper -> b
-    boolean mDisableSwipeOnSettling -> y
-    float mOverSwipeFactor -> w
-    java.lang.Integer mMaxSettleDuration -> z
-    float mSensitivity -> s
-    boolean mDisableNestedScroll -> A
-    float mProgress -> l
-    int mEnableDirection -> o
-    int mCurDisplayDistanceY -> k
-    java.util.List mListeners -> u
-    int mSwipeMaxDistance -> i
-    int mCurSwipeDistanceY -> g
-    int mHeight -> D
-    int mCachedSwipeDistanceY -> e
-    int mDirection -> c
-    int DEFAULT_OPEN_DISTANCE_IN_DP -> a
-    android.view.animation.Interpolator mInterpolator -> q
-    com.billy.android.swipe.calculator.SwipeDistanceCalculator mSwipeDistanceCalculator -> x
-    int mOpenDistance -> v
-    int mReleaseMode -> t
-    int mEdgeSize -> r
-    boolean mDisableNestedFly -> B
-    int mLockDirection -> p
-    void reset() -> A
-    com.billy.android.swipe.SwipeConsumer addListener(com.billy.android.swipe.listener.SwipeListener) -> a
-    boolean canChildScroll(android.view.ViewGroup,int,int,int,float,float) -> a
-    int clampDistanceHorizontal(int,int) -> a
-    com.billy.android.swipe.SwipeConsumer close() -> a
-    com.billy.android.swipe.SwipeConsumer close(boolean) -> a
-    com.billy.android.swipe.SwipeConsumer disableDirection(int) -> a
-    void dispatchDraw(android.graphics.Canvas) -> a
-    com.billy.android.swipe.SwipeConsumer enableDirection(int,boolean) -> a
-    android.view.View findTopChildUnder(android.view.ViewGroup,int,int) -> a
-    int getHorizontalRange(float,float) -> a
-    void onAttachToWrapper(com.billy.android.swipe.SmartSwipeWrapper,com.billy.android.swipe.internal.SwipeHelper) -> a
-    void onDisplayDistanceChanged(int,int,int,int) -> a
-    boolean onLayout(boolean,int,int,int,int) -> a
-    void onSwipeAccepted(int,boolean,float,float) -> a
-    com.billy.android.swipe.SwipeConsumer slideTo(boolean,float) -> a
-    com.billy.android.swipe.SwipeConsumer smoothSlideTo(float) -> a
-    boolean tryAcceptMoving(int,float,float,float,float) -> a
-    boolean tryAcceptSettling(int,float,float) -> a
-    int clampDistanceVertical(int,int) -> b
-    com.billy.android.swipe.SwipeConsumer enableDirection(int) -> b
-    int getDirection() -> b
-    int getVerticalRange(float,float) -> b
-    void notifySwipeProgress(boolean) -> b
-    void onDraw(android.graphics.Canvas) -> b
-    void onSwipeDistanceChanged(int,int,int,int) -> b
-    com.billy.android.swipe.SwipeConsumer removeListener(com.billy.android.swipe.listener.SwipeListener) -> b
-    int getDragState() -> c
-    boolean isDirectionEnable(int) -> c
-    void notifySwipeRelease(float,float) -> c
-    void onMeasure(int,int) -> c
-    void smoothSlideTo(int,int,int,int) -> c
-    android.view.animation.Interpolator getInterpolator() -> d
-    boolean isDirectionLocked(int) -> d
-    void onSwipeReleased(float,float) -> d
-    void smoothSlideTo(int,int) -> d
-    int getOpenDistance() -> e
-    boolean isNestedAndDisabled(int) -> e
-    void smoothOpenOrClose(float,float) -> e
-    float getProgress() -> f
-    com.billy.android.swipe.SwipeConsumer lockDirection(int) -> f
-    float getSensitivity() -> g
-    void notifySwipeStateChanged(int) -> g
-    com.billy.android.swipe.internal.SwipeHelper getSwipeHelper() -> h
-    void onStateChanged(int) -> h
-    int getSwipeOpenDistance() -> i
-    com.billy.android.swipe.SwipeConsumer unlockDirection(int) -> i
-    void initChildrenFormXml() -> j
-    boolean isBottomEnable() -> k
-    boolean isBottomLocked() -> l
-    boolean isLeftEnable() -> m
-    boolean isLeftLocked() -> n
-    boolean isRightEnable() -> o
-    boolean isRightLocked() -> p
-    boolean isTopEnable() -> q
-    boolean isTopLocked() -> r
-    void notifyAttachToWrapper() -> s
-    void notifyDetachFromWrapper() -> t
-    void notifySwipeClosed() -> u
-    void notifySwipeOpened() -> v
-    void notifySwipeStart() -> w
-    void onClosed() -> x
-    void onDetachFromWrapper() -> y
-    void onOpened() -> z
-com.billy.android.swipe.SwipeConsumer$2 -> com.billy.android.swipe.e:
-    com.billy.android.swipe.SwipeConsumer this$0 -> a
-    void onSwipeClosed(com.billy.android.swipe.SmartSwipeWrapper,com.billy.android.swipe.SwipeConsumer,int) -> a
-com.billy.android.swipe.calculator.SwipeDistanceCalculator -> com.billy.android.swipe.a.a:
-    int calculateSwipeDistance(int,float) -> a
-    int calculateSwipeOpenDistance(int) -> a
-com.billy.android.swipe.internal.ScrimView -> com.billy.android.swipe.internal.ScrimView:
-    android.graphics.Paint mShadowPaint -> i
-    int mShadowDirection -> l
-    int mShadowColor -> k
-    android.graphics.Paint mPaint -> d
-    int mDirection -> h
-    android.graphics.Rect mShadowRect -> j
-    int mScrimColor -> f
-    int mBaseAlpha -> g
-    float MIN_PROGRESS -> b
-    android.graphics.Rect mBounds -> e
-    float MAX_PROGRESS -> a
-    int mSize -> c
-com.billy.android.swipe.internal.SwipeHelper -> com.billy.android.swipe.internal.b:
-    android.view.ViewGroup mParentView -> r
-    android.view.animation.Interpolator sInterpolator -> a
-    float[] mLastMotionX -> i
-    float[] mLastMotionY -> j
-    int mPointersDown -> k
-    android.view.VelocityTracker mVelocityTracker -> l
-    float[] mInitialMotionX -> g
-    float[] mInitialMotionY -> h
-    int mActivePointerId -> f
-    int mDragState -> d
-    int mTouchSlop -> e
-    boolean mReleaseInProgress -> q
-    int maxSettleDuration -> c
-    com.billy.android.swipe.SwipeConsumer mSwipeConsumer -> p
-    android.view.ViewConfiguration viewConfiguration -> b
-    android.widget.OverScroller mScroller -> o
-    int mClampedDistanceY -> t
-    int mClampedDistanceX -> s
-    float mMinVelocity -> n
-    float mMaxVelocity -> m
-    void abort() -> a
-    float clampMag(float,float,float) -> a
-    int clampMag(int,int,int) -> a
-    com.billy.android.swipe.internal.SwipeHelper create(android.view.ViewGroup,float,com.billy.android.swipe.SwipeConsumer,android.view.animation.Interpolator) -> a
-    com.billy.android.swipe.internal.SwipeHelper create(android.view.ViewGroup,com.billy.android.swipe.SwipeConsumer,android.view.animation.Interpolator) -> a
-    void dispatchViewReleased(float,float) -> a
-    float distanceInfluenceForSnapDuration(float) -> a
-    boolean isPointerDown(int) -> a
-    boolean nestedScrollingDrag(int,int,int[],boolean) -> a
-    void processTouchEvent(android.view.MotionEvent) -> a
-    void saveInitialMotion(float,float,int) -> a
-    void setInterpolator(android.content.Context,android.view.animation.Interpolator) -> a
-    boolean smoothSlideTo(int,int) -> a
-    boolean smoothSlideTo(int,int,int,int) -> a
-    boolean trySwipe(int,boolean,float,float,float,float) -> a
-    boolean trySwipe(int,boolean,float,float,float,float,boolean) -> a
-    void cancel() -> b
-    boolean checkTouchSlop(float,float) -> b
-    int computeAxisDuration(int,int,int) -> b
-    int computeSettleDuration(int,int,int,int) -> b
-    void setDragState(int) -> b
-    boolean shouldInterceptTouchEvent(android.view.MotionEvent) -> b
-    boolean continueSettling() -> c
-    void dragTo(int,int,int,int) -> c
-    void saveLastMotion(android.view.MotionEvent) -> c
-    void setMaxSettleDuration(int) -> c
-    void clearMotionHistory(int) -> d
-    int getDragState() -> d
-    boolean smoothSettleCapturedViewTo(int,int,int,int) -> d
-    void ensureMotionHistorySizeForId(int) -> e
-    com.billy.android.swipe.SwipeConsumer getSwipeConsumer() -> e
-    boolean isValidPointerForActionMove(int) -> f
-    void nestedScrollingRelease() -> f
-    void clearMotionHistory() -> g
-    void releaseViewForPointerUp() -> h
-com.billy.android.swipe.internal.SwipeHelper$1 -> com.billy.android.swipe.internal.a:
-com.billy.android.swipe.internal.ViewCompat -> com.billy.android.swipe.internal.c:
-    boolean canListViewScrollVertical(android.widget.AbsListView,int) -> a
-    void postInvalidateOnAnimation(android.view.View) -> a
-com.billy.android.swipe.listener.SimpleSwipeListener -> com.billy.android.swipe.b.a:
-    void onConsumerDetachedFromWrapper(com.billy.android.swipe.SmartSwipeWrapper,com.billy.android.swipe.SwipeConsumer) -> a
-    void onSwipeProcess(com.billy.android.swipe.SmartSwipeWrapper,com.billy.android.swipe.SwipeConsumer,int,boolean,float) -> a
-    void onSwipeRelease(com.billy.android.swipe.SmartSwipeWrapper,com.billy.android.swipe.SwipeConsumer,int,float,float,float) -> a
-    void onSwipeStateChanged(com.billy.android.swipe.SmartSwipeWrapper,com.billy.android.swipe.SwipeConsumer,int,int,float) -> a
-    void onConsumerAttachedToWrapper(com.billy.android.swipe.SmartSwipeWrapper,com.billy.android.swipe.SwipeConsumer) -> b
-    void onSwipeStart(com.billy.android.swipe.SmartSwipeWrapper,com.billy.android.swipe.SwipeConsumer,int) -> b
-    void onSwipeOpened(com.billy.android.swipe.SmartSwipeWrapper,com.billy.android.swipe.SwipeConsumer,int) -> c
-com.billy.android.swipe.listener.SwipeListener -> com.billy.android.swipe.b.b:
-    void onConsumerDetachedFromWrapper(com.billy.android.swipe.SmartSwipeWrapper,com.billy.android.swipe.SwipeConsumer) -> a
-    void onSwipeClosed(com.billy.android.swipe.SmartSwipeWrapper,com.billy.android.swipe.SwipeConsumer,int) -> a
-    void onSwipeProcess(com.billy.android.swipe.SmartSwipeWrapper,com.billy.android.swipe.SwipeConsumer,int,boolean,float) -> a
-    void onSwipeRelease(com.billy.android.swipe.SmartSwipeWrapper,com.billy.android.swipe.SwipeConsumer,int,float,float,float) -> a
-    void onSwipeStateChanged(com.billy.android.swipe.SmartSwipeWrapper,com.billy.android.swipe.SwipeConsumer,int,int,float) -> a
-    void onConsumerAttachedToWrapper(com.billy.android.swipe.SmartSwipeWrapper,com.billy.android.swipe.SwipeConsumer) -> b
-    void onSwipeStart(com.billy.android.swipe.SmartSwipeWrapper,com.billy.android.swipe.SwipeConsumer,int) -> b
-    void onSwipeOpened(com.billy.android.swipe.SmartSwipeWrapper,com.billy.android.swipe.SwipeConsumer,int) -> c
-com.billy.android.swipe.refresh.ClassicFooter -> com.billy.android.swipe.refresh.ClassicFooter:
-    boolean mNoMoreData -> e
-com.billy.android.swipe.refresh.ClassicHeader -> com.billy.android.swipe.refresh.ClassicHeader:
-    android.widget.TextView mTitleTextView -> a
-    android.animation.ObjectAnimator animator -> d
-    int mStrResId -> c
-    android.widget.ImageView mProgressImageView -> b
-    void onInit(boolean) -> a
 com.chad.library.adapter.base.BaseItemDraggableAdapter -> com.chad.library.adapter.base.BaseItemDraggableAdapter:
     boolean itemDragEnabled -> M
     boolean itemSwipeEnabled -> N
@@ -2861,7 +2638,7 @@ com.jess.arms.base.BaseActivity -> com.jess.arms.base.BaseActivity:
     io.reactivex.subjects.BehaviorSubject mLifecycleSubject -> a
     com.jess.arms.integration.cache.Cache mCache -> b
     io.reactivex.subjects.Subject provideLifecycleSubject() -> f
-    boolean useEventBus() -> i
+    boolean useEventBus() -> j
     com.jess.arms.integration.cache.Cache provideCache() -> l
     boolean useFragment() -> m
 com.jess.arms.base.BaseApplication -> com.jess.arms.base.BaseApplication:
@@ -2874,7 +2651,7 @@ com.jess.arms.base.BaseFragment -> com.jess.arms.base.BaseFragment:
     com.jess.arms.integration.cache.Cache mCache -> c
     android.content.Context mContext -> d
     io.reactivex.subjects.Subject provideLifecycleSubject() -> f
-    boolean useEventBus() -> i
+    boolean useEventBus() -> j
     com.jess.arms.integration.cache.Cache provideCache() -> l
 com.jess.arms.base.BaseHolder -> com.jess.arms.base.BaseHolder:
     com.jess.arms.base.BaseHolder$OnViewClickListener mOnViewClickListener -> a
@@ -2968,14 +2745,14 @@ com.jess.arms.base.delegate.IActivity -> com.jess.arms.base.a.h:
     void initData(android.os.Bundle) -> a
     void setupActivityComponent(com.jess.arms.di.component.AppComponent) -> a
     int initView(android.os.Bundle) -> b
-    boolean useEventBus() -> i
+    boolean useEventBus() -> j
     com.jess.arms.integration.cache.Cache provideCache() -> l
     boolean useFragment() -> m
 com.jess.arms.base.delegate.IFragment -> com.jess.arms.base.a.i:
     void initData(android.os.Bundle) -> a
     android.view.View initView(android.view.LayoutInflater,android.view.ViewGroup,android.os.Bundle) -> a
     void setupFragmentComponent(com.jess.arms.di.component.AppComponent) -> a
-    boolean useEventBus() -> i
+    boolean useEventBus() -> j
     com.jess.arms.integration.cache.Cache provideCache() -> l
 com.jess.arms.di.component.AppComponent -> com.jess.arms.a.a.a:
     android.app.Application application() -> a
@@ -4251,7 +4028,6 @@ kotlin.collections.ArrayAsCollection -> kotlin.collections.a:
     boolean isVarargs -> b
     int getSize() -> a
 kotlin.collections.ArraysKt -> kotlin.collections.b:
-    java.util.List asList(java.lang.Object[]) -> a
     boolean contains(int[],int) -> a
     java.lang.Object[] copyInto$default(java.lang.Object[],java.lang.Object[],int,int,int,int,java.lang.Object) -> a
     char single(char[]) -> a
@@ -4289,7 +4065,6 @@ kotlin.collections.CollectionsKt -> kotlin.collections.h:
     java.util.List listOf(java.lang.Object) -> a
     int[] toIntArray(java.util.Collection) -> a
     java.util.List optimizeReadOnlyList(java.util.List) -> b
-    java.lang.Object single(java.lang.Iterable) -> b
     java.util.List take(java.lang.Iterable,int) -> b
     java.util.List listOf(java.lang.Object[]) -> c
     java.lang.Object firstOrNull(java.util.List) -> e
@@ -4317,15 +4092,13 @@ kotlin.collections.CollectionsKt___CollectionsKt -> kotlin.collections.r:
     java.lang.Object first(java.lang.Iterable) -> a
     java.util.Collection toCollection(java.lang.Iterable,java.util.Collection) -> a
     int[] toIntArray(java.util.Collection) -> a
-    java.lang.Object single(java.lang.Iterable) -> b
     java.util.List take(java.lang.Iterable,int) -> b
+    java.util.List toList(java.lang.Iterable) -> b
     java.util.List toMutableList(java.util.Collection) -> b
-    java.util.List toList(java.lang.Iterable) -> c
+    java.util.List toMutableList(java.lang.Iterable) -> c
     java.lang.Object first(java.util.List) -> d
-    java.util.List toMutableList(java.lang.Iterable) -> d
     java.lang.Object firstOrNull(java.util.List) -> e
     java.lang.Object last(java.util.List) -> f
-    java.lang.Object single(java.util.List) -> g
 kotlin.collections.EmptyIterator -> kotlin.collections.s:
     kotlin.collections.EmptyIterator INSTANCE -> a
 kotlin.collections.EmptyList -> kotlin.collections.EmptyList:
@@ -4629,8 +4402,6 @@ kotlin.ranges.IntRange -> kotlin.d.d:
     kotlin.ranges.IntRange EMPTY -> e
     kotlin.ranges.IntRange$Companion Companion -> f
     kotlin.ranges.IntRange access$getEMPTY$cp() -> b
-    java.lang.Integer getEndInclusive() -> c
-    java.lang.Integer getStart() -> d
 kotlin.ranges.IntRange$Companion -> kotlin.d.d$a:
     kotlin.ranges.IntRange getEMPTY() -> a
 kotlin.ranges.RangesKt -> kotlin.d.e:
@@ -4671,8 +4442,6 @@ kotlin.sequences.ConstrainedOnceSequence -> kotlin.f.a:
 kotlin.sequences.Sequence -> kotlin.f.b:
 kotlin.sequences.SequencesKt -> kotlin.f.c:
     kotlin.sequences.Sequence asSequence(java.util.Iterator) -> a
-    java.lang.String joinToString$default(kotlin.sequences.Sequence,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,kotlin.jvm.functions.Function1,int,java.lang.Object) -> a
-    kotlin.sequences.Sequence map(kotlin.sequences.Sequence,kotlin.jvm.functions.Function1) -> a
     java.util.List toList(kotlin.sequences.Sequence) -> b
 kotlin.sequences.SequencesKt__SequenceBuilderKt -> kotlin.f.d:
 kotlin.sequences.SequencesKt__SequencesJVMKt -> kotlin.f.e:
@@ -4683,83 +4452,48 @@ kotlin.sequences.SequencesKt__SequencesKt$asSequence$$inlined$Sequence$1 -> kotl
     java.util.Iterator $this_asSequence$inlined -> a
 kotlin.sequences.SequencesKt___SequencesJvmKt -> kotlin.f.h:
 kotlin.sequences.SequencesKt___SequencesKt -> kotlin.f.i:
-    java.lang.Appendable joinTo(kotlin.sequences.Sequence,java.lang.Appendable,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,kotlin.jvm.functions.Function1) -> a
-    java.lang.String joinToString(kotlin.sequences.Sequence,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,kotlin.jvm.functions.Function1) -> a
-    java.lang.String joinToString$default(kotlin.sequences.Sequence,java.lang.CharSequence,java.lang.CharSequence,java.lang.CharSequence,int,java.lang.CharSequence,kotlin.jvm.functions.Function1,int,java.lang.Object) -> a
-    kotlin.sequences.Sequence map(kotlin.sequences.Sequence,kotlin.jvm.functions.Function1) -> a
     java.util.Collection toCollection(kotlin.sequences.Sequence,java.util.Collection) -> a
     java.util.List toList(kotlin.sequences.Sequence) -> b
     java.util.List toMutableList(kotlin.sequences.Sequence) -> c
-kotlin.sequences.TransformingSequence -> kotlin.f.k:
-    kotlin.sequences.Sequence sequence -> a
-    kotlin.jvm.functions.Function1 transformer -> b
-    kotlin.sequences.Sequence access$getSequence$p(kotlin.sequences.TransformingSequence) -> a
-    kotlin.jvm.functions.Function1 access$getTransformer$p(kotlin.sequences.TransformingSequence) -> b
-kotlin.sequences.TransformingSequence$iterator$1 -> kotlin.f.j:
-    kotlin.sequences.TransformingSequence this$0 -> b
-    java.util.Iterator iterator -> a
 kotlin.text.CharsKt__CharJVMKt -> kotlin.text.a:
     int checkRadix(int) -> a
     int digitOf(char,int) -> a
     boolean isWhitespace(char) -> a
 kotlin.text.CharsKt__CharKt -> kotlin.text.b:
     boolean equals(char,char,boolean) -> a
-kotlin.text.DelimitedRangesSequence -> kotlin.text.d:
-    java.lang.CharSequence input -> a
-    int startIndex -> b
-    int limit -> c
-    kotlin.jvm.functions.Function2 getNextMatch -> d
-    kotlin.jvm.functions.Function2 access$getGetNextMatch$p(kotlin.text.DelimitedRangesSequence) -> a
-    java.lang.CharSequence access$getInput$p(kotlin.text.DelimitedRangesSequence) -> b
-    int access$getLimit$p(kotlin.text.DelimitedRangesSequence) -> c
-    int access$getStartIndex$p(kotlin.text.DelimitedRangesSequence) -> d
-kotlin.text.DelimitedRangesSequence$iterator$1 -> kotlin.text.c:
-    kotlin.ranges.IntRange nextItem -> d
-    kotlin.text.DelimitedRangesSequence this$0 -> f
-    int counter -> e
-    int currentStartIndex -> b
-    int nextSearchIndex -> c
-    int nextState -> a
-    void calcNext() -> a
 kotlin.text.Regex -> kotlin.text.Regex:
     kotlin.text.Regex$Companion Companion -> a
     java.util.regex.Pattern nativePattern -> b
     java.util.List split(java.lang.CharSequence,int) -> a
 kotlin.text.Regex$Companion -> kotlin.text.Regex$a:
-kotlin.text.StringsKt -> kotlin.text.e:
-    void appendElement(java.lang.Appendable,java.lang.Object,kotlin.jvm.functions.Function1) -> a
+kotlin.text.StringsKt -> kotlin.text.c:
     boolean contains$default(java.lang.CharSequence,java.lang.CharSequence,boolean,int,java.lang.Object) -> a
     int indexOf$default(java.lang.CharSequence,char,int,boolean,int,java.lang.Object) -> a
     int indexOf$default(java.lang.CharSequence,java.lang.String,int,boolean,int,java.lang.Object) -> a
     boolean isBlank(java.lang.CharSequence) -> a
-    java.lang.String replace$default(java.lang.String,java.lang.String,java.lang.String,boolean,int,java.lang.Object) -> a
     boolean startsWith$default(java.lang.String,java.lang.String,boolean,int,java.lang.Object) -> a
     java.lang.Integer toIntOrNull(java.lang.String) -> a
     int lastIndexOf$default(java.lang.CharSequence,java.lang.String,int,boolean,int,java.lang.Object) -> b
     java.lang.Long toLongOrNull(java.lang.String) -> b
     java.lang.CharSequence trim(java.lang.CharSequence) -> d
     char first(java.lang.CharSequence) -> e
-kotlin.text.StringsKt__IndentKt -> kotlin.text.f:
-kotlin.text.StringsKt__RegexExtensionsJVMKt -> kotlin.text.g:
-kotlin.text.StringsKt__RegexExtensionsKt -> kotlin.text.h:
-kotlin.text.StringsKt__StringBuilderJVMKt -> kotlin.text.i:
-kotlin.text.StringsKt__StringBuilderKt -> kotlin.text.j:
-    void appendElement(java.lang.Appendable,java.lang.Object,kotlin.jvm.functions.Function1) -> a
-kotlin.text.StringsKt__StringNumberConversionsJVMKt -> kotlin.text.k:
-kotlin.text.StringsKt__StringNumberConversionsKt -> kotlin.text.l:
+kotlin.text.StringsKt__IndentKt -> kotlin.text.d:
+kotlin.text.StringsKt__RegexExtensionsJVMKt -> kotlin.text.e:
+kotlin.text.StringsKt__RegexExtensionsKt -> kotlin.text.f:
+kotlin.text.StringsKt__StringBuilderJVMKt -> kotlin.text.g:
+kotlin.text.StringsKt__StringBuilderKt -> kotlin.text.h:
+kotlin.text.StringsKt__StringNumberConversionsJVMKt -> kotlin.text.i:
+kotlin.text.StringsKt__StringNumberConversionsKt -> kotlin.text.j:
     java.lang.Integer toIntOrNull(java.lang.String) -> a
     java.lang.Integer toIntOrNull(java.lang.String,int) -> a
     java.lang.Long toLongOrNull(java.lang.String) -> b
     java.lang.Long toLongOrNull(java.lang.String,int) -> b
-kotlin.text.StringsKt__StringsJVMKt -> kotlin.text.m:
+kotlin.text.StringsKt__StringsJVMKt -> kotlin.text.k:
     boolean isBlank(java.lang.CharSequence) -> a
     boolean regionMatches(java.lang.String,int,java.lang.String,int,int,boolean) -> a
-    java.lang.String replace(java.lang.String,java.lang.String,java.lang.String,boolean) -> a
-    java.lang.String replace$default(java.lang.String,java.lang.String,java.lang.String,boolean,int,java.lang.Object) -> a
     boolean startsWith(java.lang.String,java.lang.String,boolean) -> a
     boolean startsWith$default(java.lang.String,java.lang.String,boolean,int,java.lang.Object) -> a
-kotlin.text.StringsKt__StringsKt -> kotlin.text.n:
-    kotlin.Pair access$findAnyOf(java.lang.CharSequence,java.util.Collection,int,boolean,boolean) -> a
+kotlin.text.StringsKt__StringsKt -> kotlin.text.l:
     boolean contains(java.lang.CharSequence,java.lang.CharSequence,boolean) -> a
     boolean contains$default(java.lang.CharSequence,java.lang.CharSequence,boolean,int,java.lang.Object) -> a
     int indexOf(java.lang.CharSequence,char,int,boolean) -> a
@@ -4769,28 +4503,14 @@ kotlin.text.StringsKt__StringsKt -> kotlin.text.n:
     int indexOf$default(java.lang.CharSequence,char,int,boolean,int,java.lang.Object) -> a
     int indexOf$default(java.lang.CharSequence,java.lang.String,int,boolean,int,java.lang.Object) -> a
     int indexOfAny(java.lang.CharSequence,char[],int,boolean) -> a
-    kotlin.sequences.Sequence rangesDelimitedBy$StringsKt__StringsKt(java.lang.CharSequence,java.lang.String[],int,boolean,int) -> a
-    kotlin.sequences.Sequence rangesDelimitedBy$StringsKt__StringsKt$default(java.lang.CharSequence,java.lang.String[],int,boolean,int,int,java.lang.Object) -> a
     boolean regionMatchesImpl(java.lang.CharSequence,int,java.lang.CharSequence,int,int,boolean) -> a
-    kotlin.sequences.Sequence splitToSequence(java.lang.CharSequence,java.lang.String[],boolean,int) -> a
-    kotlin.sequences.Sequence splitToSequence$default(java.lang.CharSequence,java.lang.String[],boolean,int,int,java.lang.Object) -> a
-    java.lang.String substring(java.lang.CharSequence,kotlin.ranges.IntRange) -> a
-    kotlin.Pair findAnyOf$StringsKt__StringsKt(java.lang.CharSequence,java.util.Collection,int,boolean,boolean) -> b
     kotlin.ranges.IntRange getIndices(java.lang.CharSequence) -> b
     int lastIndexOf(java.lang.CharSequence,java.lang.String,int,boolean) -> b
     int lastIndexOf$default(java.lang.CharSequence,java.lang.String,int,boolean,int,java.lang.Object) -> b
     int getLastIndex(java.lang.CharSequence) -> c
     java.lang.CharSequence trim(java.lang.CharSequence) -> d
-kotlin.text.StringsKt__StringsKt$rangesDelimitedBy$4 -> kotlin.text.StringsKt__StringsKt$rangesDelimitedBy$4:
-    java.util.List $delimitersList -> a
-    boolean $ignoreCase -> b
-    java.lang.Object invoke(java.lang.Object,java.lang.Object) -> a
-    kotlin.Pair invoke(java.lang.CharSequence,int) -> a
-kotlin.text.StringsKt__StringsKt$splitToSequence$1 -> kotlin.text.StringsKt__StringsKt$splitToSequence$1:
-    java.lang.CharSequence $this_splitToSequence -> a
-    java.lang.String invoke(kotlin.ranges.IntRange) -> a
-kotlin.text.StringsKt___StringsJvmKt -> kotlin.text.o:
-kotlin.text.StringsKt___StringsKt -> kotlin.text.p:
+kotlin.text.StringsKt___StringsJvmKt -> kotlin.text.m:
+kotlin.text.StringsKt___StringsKt -> kotlin.text.n:
     char first(java.lang.CharSequence) -> e
 kotlinx.coroutines.AbstractCoroutine -> kotlinx.coroutines.a:
     kotlin.coroutines.CoroutineContext parentContext -> c
@@ -5071,7 +4791,7 @@ kotlinx.coroutines.EventLoopImplBase$DelayedTask -> kotlinx.coroutines.V$a:
     void setHeap(kotlinx.coroutines.internal.ThreadSafeHeap) -> a
     boolean timeToExecute(long) -> a
 kotlinx.coroutines.EventLoopImplBase$DelayedTaskQueue -> kotlinx.coroutines.V$b:
-    long timeNow -> c
+    long timeNow -> b
 kotlinx.coroutines.EventLoopImplPlatform -> kotlinx.coroutines.W:
     void reschedule(long,kotlinx.coroutines.EventLoopImplBase$DelayedTask) -> a
     java.lang.Thread getThread() -> t
@@ -5452,8 +5172,6 @@ kotlinx.coroutines.internal.ThreadContextKt$updateState$1 -> kotlinx.coroutines.
     java.lang.Object invoke(java.lang.Object,java.lang.Object) -> a
     kotlinx.coroutines.internal.ThreadState invoke(kotlinx.coroutines.internal.ThreadState,kotlin.coroutines.CoroutineContext$Element) -> a
 kotlinx.coroutines.internal.ThreadSafeHeap -> kotlinx.coroutines.internal.t:
-    java.util.concurrent.atomic.AtomicIntegerFieldUpdater _size$FU -> a
-    kotlinx.coroutines.internal.ThreadSafeHeapNode[] a -> b
     void addImpl(kotlinx.coroutines.internal.ThreadSafeHeapNode) -> a
     kotlinx.coroutines.internal.ThreadSafeHeapNode firstImpl() -> a
     kotlinx.coroutines.internal.ThreadSafeHeapNode removeAtImpl(int) -> a
@@ -5727,7 +5445,9 @@ me.hegj.wandroid.app.utils.DatetimeUtil -> me.hegj.wandroid.app.utils.j:
     me.hegj.wandroid.app.utils.DatetimeUtil INSTANCE -> d
     java.lang.String formatDate(long,java.lang.String) -> a
     java.lang.String formatDate(java.util.Date,java.lang.String) -> a
+    java.util.Date formatDate(java.lang.String,java.lang.String) -> a
     java.util.Date formatDate(java.lang.String,java.util.Date) -> a
+    java.util.Date getCustomTime(java.lang.String) -> a
     java.lang.String getDATE_PATTERN() -> a
     java.lang.String getDATE_PATTERN_SS() -> b
     java.util.Date getNow() -> c
@@ -5763,6 +5483,7 @@ me.hegj.wandroid.app.utils.SettingUtil -> me.hegj.wandroid.app.utils.o:
     me.hegj.wandroid.app.utils.SettingUtil INSTANCE -> a
     int getColor(android.content.Context) -> a
     android.content.res.ColorStateList getOneColorStateList(int) -> a
+    boolean isHoliDay() -> a
     void setColor(android.content.Context,int) -> a
     void setLoadingColor(android.content.Context,com.kingja.loadsir.core.LoadService) -> a
     void setShapColor(android.view.View,int) -> a
@@ -5948,9 +5669,11 @@ me.hegj.wandroid.di.component.main.home.DaggerHomeComponent -> me.hegj.wandroid.
     javax.inject.Provider provideHomeModelProvider -> e
     javax.inject.Provider gsonProvider -> b
     javax.inject.Provider repositoryManagerProvider -> a
+    javax.inject.Provider homePresenterProvider -> l
+    javax.inject.Provider getAdapterProvider -> k
     javax.inject.Provider imageLoaderProvider -> h
     javax.inject.Provider rxErrorHandlerProvider -> g
-    javax.inject.Provider homePresenterProvider -> j
+    javax.inject.Provider getDataProvider -> j
     javax.inject.Provider appManagerProvider -> i
     me.hegj.wandroid.di.component.main.home.DaggerHomeComponent$Builder builder() -> a
     void initialize(me.hegj.wandroid.di.module.main.home.HomeModule,com.jess.arms.di.component.AppComponent) -> a
@@ -6535,14 +6258,25 @@ me.hegj.wandroid.di.module.integral.IntegralModule_ProvideIntegralViewFactory ->
     me.hegj.wandroid.mvp.contract.integral.IntegralContract$View provideIntegralView(me.hegj.wandroid.di.module.integral.IntegralModule) -> b
 me.hegj.wandroid.di.module.main.home.HomeModule -> me.hegj.wandroid.a.b.c.a.a:
     me.hegj.wandroid.mvp.contract.main.home.HomeContract$View view -> a
+    me.hegj.wandroid.mvp.ui.adapter.AriticleAdapter getAdapter(java.util.ArrayList) -> a
+    java.util.ArrayList getData() -> a
     me.hegj.wandroid.mvp.contract.main.home.HomeContract$Model provideHomeModel(me.hegj.wandroid.mvp.model.main.home.HomeModel) -> a
-    me.hegj.wandroid.mvp.contract.main.home.HomeContract$View provideHomeView() -> a
-me.hegj.wandroid.di.module.main.home.HomeModule_ProvideHomeModelFactory -> me.hegj.wandroid.a.b.c.a.b:
+    me.hegj.wandroid.mvp.contract.main.home.HomeContract$View provideHomeView() -> b
+me.hegj.wandroid.di.module.main.home.HomeModule_GetAdapterFactory -> me.hegj.wandroid.a.b.c.a.b:
+    javax.inject.Provider dataProvider -> b
+    me.hegj.wandroid.di.module.main.home.HomeModule module -> a
+    me.hegj.wandroid.di.module.main.home.HomeModule_GetAdapterFactory create(me.hegj.wandroid.di.module.main.home.HomeModule,javax.inject.Provider) -> a
+    me.hegj.wandroid.mvp.ui.adapter.AriticleAdapter getAdapter(me.hegj.wandroid.di.module.main.home.HomeModule,java.util.ArrayList) -> a
+me.hegj.wandroid.di.module.main.home.HomeModule_GetDataFactory -> me.hegj.wandroid.a.b.c.a.c:
+    me.hegj.wandroid.di.module.main.home.HomeModule module -> a
+    me.hegj.wandroid.di.module.main.home.HomeModule_GetDataFactory create(me.hegj.wandroid.di.module.main.home.HomeModule) -> a
+    java.util.ArrayList getData(me.hegj.wandroid.di.module.main.home.HomeModule) -> b
+me.hegj.wandroid.di.module.main.home.HomeModule_ProvideHomeModelFactory -> me.hegj.wandroid.a.b.c.a.d:
     javax.inject.Provider modelProvider -> b
     me.hegj.wandroid.di.module.main.home.HomeModule module -> a
     me.hegj.wandroid.di.module.main.home.HomeModule_ProvideHomeModelFactory create(me.hegj.wandroid.di.module.main.home.HomeModule,javax.inject.Provider) -> a
     me.hegj.wandroid.mvp.contract.main.home.HomeContract$Model provideHomeModel(me.hegj.wandroid.di.module.main.home.HomeModule,me.hegj.wandroid.mvp.model.main.home.HomeModel) -> a
-me.hegj.wandroid.di.module.main.home.HomeModule_ProvideHomeViewFactory -> me.hegj.wandroid.a.b.c.a.c:
+me.hegj.wandroid.di.module.main.home.HomeModule_ProvideHomeViewFactory -> me.hegj.wandroid.a.b.c.a.e:
     me.hegj.wandroid.di.module.main.home.HomeModule module -> a
     me.hegj.wandroid.di.module.main.home.HomeModule_ProvideHomeViewFactory create(me.hegj.wandroid.di.module.main.home.HomeModule) -> a
     me.hegj.wandroid.mvp.contract.main.home.HomeContract$View provideHomeView(me.hegj.wandroid.di.module.main.home.HomeModule) -> b
@@ -6832,7 +6566,7 @@ me.hegj.wandroid.mvp.contract.todo.AddTodoContract$Model -> me.hegj.wandroid.b.a
     io.reactivex.Observable updateTodo(java.lang.String,java.lang.String,java.lang.String,int,int,int) -> a
 me.hegj.wandroid.mvp.contract.todo.AddTodoContract$View -> me.hegj.wandroid.b.a.e.b:
     void addTodoFaild(java.lang.String) -> f
-    void addTodoSucc() -> j
+    void addTodoSucc() -> g
 me.hegj.wandroid.mvp.contract.todo.TodoContract$Model -> me.hegj.wandroid.b.a.e.c:
     io.reactivex.Observable updateTodoData(int,int) -> b
     io.reactivex.Observable getTodoData(int) -> c
@@ -7362,6 +7096,7 @@ me.hegj.wandroid.mvp.presenter.integral.IntegralPresenter_MembersInjector -> me.
 me.hegj.wandroid.mvp.presenter.main.home.HomePresenter -> me.hegj.wandroid.mvp.presenter.main.home.HomePresenter:
     me.jessyan.rxerrorhandler.core.RxErrorHandler mErrorHandler -> e
     com.jess.arms.integration.AppManager mAppManager -> h
+    me.hegj.wandroid.mvp.ui.adapter.AriticleAdapter adapter -> i
     android.app.Application mApplication -> f
     com.jess.arms.http.imageloader.ImageLoader mImageLoader -> g
     me.hegj.wandroid.mvp.contract.main.home.HomeContract$Model access$getMModel$p(me.hegj.wandroid.mvp.presenter.main.home.HomePresenter) -> a
@@ -7398,8 +7133,10 @@ me.hegj.wandroid.mvp.presenter.main.home.HomePresenter_Factory -> me.hegj.wandro
     javax.inject.Provider mImageLoaderProvider -> e
     javax.inject.Provider rootViewProvider -> b
     javax.inject.Provider modelProvider -> a
-    me.hegj.wandroid.mvp.presenter.main.home.HomePresenter_Factory create(javax.inject.Provider,javax.inject.Provider,javax.inject.Provider,javax.inject.Provider,javax.inject.Provider,javax.inject.Provider) -> a
+    javax.inject.Provider adapterProvider -> g
+    me.hegj.wandroid.mvp.presenter.main.home.HomePresenter_Factory create(javax.inject.Provider,javax.inject.Provider,javax.inject.Provider,javax.inject.Provider,javax.inject.Provider,javax.inject.Provider,javax.inject.Provider) -> a
 me.hegj.wandroid.mvp.presenter.main.home.HomePresenter_MembersInjector -> me.hegj.wandroid.mvp.presenter.main.home.g:
+    void injectAdapter(me.hegj.wandroid.mvp.presenter.main.home.HomePresenter,me.hegj.wandroid.mvp.ui.adapter.AriticleAdapter) -> a
     void injectMAppManager(me.hegj.wandroid.mvp.presenter.main.home.HomePresenter,com.jess.arms.integration.AppManager) -> a
     void injectMApplication(me.hegj.wandroid.mvp.presenter.main.home.HomePresenter,android.app.Application) -> a
     void injectMErrorHandler(me.hegj.wandroid.mvp.presenter.main.home.HomePresenter,me.jessyan.rxerrorhandler.core.RxErrorHandler) -> a
@@ -7846,7 +7583,7 @@ me.hegj.wandroid.mvp.ui.BaseActivity -> me.hegj.wandroid.mvp.ui.BaseActivity:
     void hideLoading() -> d
     void showLoading() -> e
     io.reactivex.subjects.Subject provideLifecycleSubject() -> f
-    boolean useEventBus() -> i
+    boolean useEventBus() -> j
     com.jess.arms.integration.cache.Cache provideCache() -> l
     boolean useFragment() -> m
 me.hegj.wandroid.mvp.ui.BaseActivity_MembersInjector -> me.hegj.wandroid.mvp.ui.a:
@@ -7864,7 +7601,7 @@ me.hegj.wandroid.mvp.ui.BaseFragment -> me.hegj.wandroid.mvp.ui.BaseFragment:
     void hideLoading() -> d
     void showLoading() -> e
     io.reactivex.subjects.Subject provideLifecycleSubject() -> f
-    boolean useEventBus() -> i
+    boolean useEventBus() -> j
     com.jess.arms.integration.cache.Cache provideCache() -> l
     void _$_clearFindViewByIdCache() -> p
 me.hegj.wandroid.mvp.ui.BaseFragment_MembersInjector -> me.hegj.wandroid.mvp.ui.b:
@@ -7874,8 +7611,8 @@ me.hegj.wandroid.mvp.ui.activity.MainActivity -> me.hegj.wandroid.mvp.ui.activit
     void initData(android.os.Bundle) -> a
     void setupActivityComponent(com.jess.arms.di.component.AppComponent) -> a
     int initView(android.os.Bundle) -> b
-    void onBackPressedSupport() -> g
-    me.yokeyword.fragmentation.anim.FragmentAnimator onCreateFragmentAnimator() -> h
+    void onBackPressedSupport() -> h
+    me.yokeyword.fragmentation.anim.FragmentAnimator onCreateFragmentAnimator() -> i
 me.hegj.wandroid.mvp.ui.activity.collect.CollectActivity -> me.hegj.wandroid.mvp.ui.activity.collect.CollectActivity:
     java.util.HashMap _$_findViewCache -> h
     java.util.List fragments -> f
@@ -8145,27 +7882,31 @@ me.hegj.wandroid.mvp.ui.activity.main.home.HomeFragment$initData$$inlined$run$la
     me.hegj.wandroid.mvp.ui.activity.main.home.HomeFragment this$0 -> a
 me.hegj.wandroid.mvp.ui.activity.main.home.HomeFragment$initData$$inlined$run$lambda$3 -> me.hegj.wandroid.mvp.ui.activity.main.home.e:
     me.hegj.wandroid.mvp.ui.activity.main.home.HomeFragment this$0 -> a
-me.hegj.wandroid.mvp.ui.activity.main.home.HomeFragment$initData$$inlined$run$lambda$4 -> me.hegj.wandroid.mvp.ui.activity.main.home.HomeFragment$initData$$inlined$run$lambda$4:
+me.hegj.wandroid.mvp.ui.activity.main.home.HomeFragment$initData$$inlined$run$lambda$4 -> me.hegj.wandroid.mvp.ui.activity.main.home.f:
+    me.hegj.wandroid.mvp.ui.activity.main.home.HomeFragment this$0 -> a
+me.hegj.wandroid.mvp.ui.activity.main.home.HomeFragment$initData$$inlined$run$lambda$5 -> me.hegj.wandroid.mvp.ui.activity.main.home.HomeFragment$initData$$inlined$run$lambda$5:
     com.yanzhenjie.recyclerview.SwipeRecyclerView $this_run -> a
     me.hegj.wandroid.mvp.ui.activity.main.home.HomeFragment this$0 -> b
-me.hegj.wandroid.mvp.ui.activity.main.home.HomeFragment$initData$5 -> me.hegj.wandroid.mvp.ui.activity.main.home.f:
+me.hegj.wandroid.mvp.ui.activity.main.home.HomeFragment$initData$5 -> me.hegj.wandroid.mvp.ui.activity.main.home.g:
     me.hegj.wandroid.mvp.ui.activity.main.home.HomeFragment this$0 -> a
     void onLoadMore() -> a
 me.hegj.wandroid.mvp.ui.activity.main.home.HomeFragment$initView$1 -> me.hegj.wandroid.mvp.ui.activity.main.home.HomeFragment$initView$1:
     me.hegj.wandroid.mvp.ui.activity.main.home.HomeFragment this$0 -> a
-me.hegj.wandroid.mvp.ui.activity.main.home.HomeFragment$requestAritilFaild$1 -> me.hegj.wandroid.mvp.ui.activity.main.home.g:
+me.hegj.wandroid.mvp.ui.activity.main.home.HomeFragment$requestAritilFaild$1 -> me.hegj.wandroid.mvp.ui.activity.main.home.h:
     java.lang.String $errorMsg -> a
-me.hegj.wandroid.mvp.ui.activity.main.home.HomeFragment$requestAritilSucces$1 -> me.hegj.wandroid.mvp.ui.activity.main.home.h:
+me.hegj.wandroid.mvp.ui.activity.main.home.HomeFragment$requestAritilSucces$1 -> me.hegj.wandroid.mvp.ui.activity.main.home.i:
     me.hegj.wandroid.mvp.ui.activity.main.home.HomeFragment this$0 -> a
-me.hegj.wandroid.mvp.ui.activity.main.home.HomeFragment$requestBannerSucces$$inlined$apply$lambda$1 -> me.hegj.wandroid.mvp.ui.activity.main.home.i:
+me.hegj.wandroid.mvp.ui.activity.main.home.HomeFragment$requestBannerSucces$$inlined$apply$lambda$1 -> me.hegj.wandroid.mvp.ui.activity.main.home.j:
     java.util.List $banners$inlined -> b
     me.hegj.wandroid.mvp.ui.activity.main.home.HomeFragment this$0 -> a
     void fillBannerItem(cn.bingoogolapple.bgabanner.BGABanner,android.view.View,java.lang.Object,int) -> a
     void fillBannerItem(cn.bingoogolapple.bgabanner.BGABanner,android.widget.ImageView,me.hegj.wandroid.mvp.model.entity.BannerResponse,int) -> a
-me.hegj.wandroid.mvp.ui.activity.main.home.HomeFragment$requestBannerSucces$$inlined$apply$lambda$2 -> me.hegj.wandroid.mvp.ui.activity.main.home.j:
+me.hegj.wandroid.mvp.ui.activity.main.home.HomeFragment$requestBannerSucces$$inlined$apply$lambda$2 -> me.hegj.wandroid.mvp.ui.activity.main.home.k:
     java.util.List $banners$inlined -> b
     me.hegj.wandroid.mvp.ui.activity.main.home.HomeFragment this$0 -> a
     void onBannerItemClick(cn.bingoogolapple.bgabanner.BGABanner,android.view.View,java.lang.Object,int) -> a
+me.hegj.wandroid.mvp.ui.activity.main.home.HomeFragment_MembersInjector -> me.hegj.wandroid.mvp.ui.activity.main.home.l:
+    void injectAdapter(me.hegj.wandroid.mvp.ui.activity.main.home.HomeFragment,me.hegj.wandroid.mvp.ui.adapter.AriticleAdapter) -> a
 me.hegj.wandroid.mvp.ui.activity.main.home.search.SearchActivity -> me.hegj.wandroid.mvp.ui.activity.main.home.search.SearchActivity:
     java.util.HashMap _$_findViewCache -> h
     java.util.List historyData -> f
@@ -8816,7 +8557,7 @@ me.hegj.wandroid.mvp.ui.activity.todo.AddTodoActivity -> me.hegj.wandroid.mvp.ui
     int initView(android.os.Bundle) -> b
     android.view.View _$_findCachedViewById(int) -> e
     void addTodoFaild(java.lang.String) -> f
-    void addTodoSucc() -> j
+    void addTodoSucc() -> g
 me.hegj.wandroid.mvp.ui.activity.todo.AddTodoActivity$initData$$inlined$run$lambda$1 -> me.hegj.wandroid.mvp.ui.activity.todo.a:
     me.hegj.wandroid.mvp.ui.activity.todo.AddTodoActivity this$0 -> a
 me.hegj.wandroid.mvp.ui.activity.todo.AddTodoActivity$onViewClicked$$inlined$apply$lambda$1 -> me.hegj.wandroid.mvp.ui.activity.todo.b:
@@ -9028,6 +8769,7 @@ me.hegj.wandroid.mvp.ui.adapter.TodoAdapter -> me.hegj.wandroid.mvp.ui.adapter.T
     void convert(com.chad.library.adapter.base.BaseViewHolder,me.hegj.wandroid.mvp.model.entity.TodoResponse) -> a
 me.hegj.wandroid.mvp.ui.adapter.ViewPagerAdapter -> me.hegj.wandroid.mvp.ui.adapter.ViewPagerAdapter:
     java.util.List fragments -> a
+me.hegj.wandroid.mvp.ui.base.BaseIView -> me.hegj.wandroid.mvp.ui.a.a:
 me.jessyan.progressmanager.ProgressListener -> me.jessyan.progressmanager.a:
     void onError(long,java.lang.Exception) -> a
     void onProgress(me.jessyan.progressmanager.body.ProgressInfo) -> a
@@ -9118,16 +8860,16 @@ me.yokeyword.fragmentation.Fragmentation$FragmentationBuilder -> me.yokeyword.fr
     int access$100(me.yokeyword.fragmentation.Fragmentation$FragmentationBuilder) -> b
     me.yokeyword.fragmentation.helper.ExceptionHandler access$200(me.yokeyword.fragmentation.Fragmentation$FragmentationBuilder) -> c
 me.yokeyword.fragmentation.ISupportActivity -> me.yokeyword.fragmentation.b:
-    void onBackPressedSupport() -> g
-    me.yokeyword.fragmentation.anim.FragmentAnimator onCreateFragmentAnimator() -> h
+    void onBackPressedSupport() -> h
+    me.yokeyword.fragmentation.anim.FragmentAnimator onCreateFragmentAnimator() -> i
     me.yokeyword.fragmentation.SupportActivityDelegate getSupportDelegate() -> k
     me.yokeyword.fragmentation.anim.FragmentAnimator getFragmentAnimator() -> n
 me.yokeyword.fragmentation.ISupportFragment -> me.yokeyword.fragmentation.c:
     void onFragmentResult(int,int,android.os.Bundle) -> a
     void onEnterAnimationEnd(android.os.Bundle) -> b
     void onLazyInitView(android.os.Bundle) -> c
-    boolean onBackPressedSupport() -> g
-    me.yokeyword.fragmentation.anim.FragmentAnimator onCreateFragmentAnimator() -> h
+    boolean onBackPressedSupport() -> h
+    me.yokeyword.fragmentation.anim.FragmentAnimator onCreateFragmentAnimator() -> i
     me.yokeyword.fragmentation.SupportFragmentDelegate getSupportDelegate() -> k
     boolean isSupportVisible() -> m
     void onSupportInvisible() -> n
@@ -9135,8 +8877,8 @@ me.yokeyword.fragmentation.ISupportFragment -> me.yokeyword.fragmentation.c:
 me.yokeyword.fragmentation.SupportActivity -> me.yokeyword.fragmentation.SupportActivity:
     me.yokeyword.fragmentation.ISupportFragment findFragment(java.lang.Class) -> a
     void loadRootFragment(int,me.yokeyword.fragmentation.ISupportFragment) -> a
-    void onBackPressedSupport() -> g
-    me.yokeyword.fragmentation.anim.FragmentAnimator onCreateFragmentAnimator() -> h
+    void onBackPressedSupport() -> h
+    me.yokeyword.fragmentation.anim.FragmentAnimator onCreateFragmentAnimator() -> i
     me.yokeyword.fragmentation.SupportActivityDelegate getSupportDelegate() -> k
     me.yokeyword.fragmentation.anim.FragmentAnimator getFragmentAnimator() -> n
 me.yokeyword.fragmentation.SupportActivityDelegate -> me.yokeyword.fragmentation.e:
@@ -9177,8 +8919,8 @@ me.yokeyword.fragmentation.SupportFragment -> me.yokeyword.fragmentation.Support
     void showHideFragment(me.yokeyword.fragmentation.ISupportFragment) -> a
     void onEnterAnimationEnd(android.os.Bundle) -> b
     void onLazyInitView(android.os.Bundle) -> c
-    boolean onBackPressedSupport() -> g
-    me.yokeyword.fragmentation.anim.FragmentAnimator onCreateFragmentAnimator() -> h
+    boolean onBackPressedSupport() -> h
+    me.yokeyword.fragmentation.anim.FragmentAnimator onCreateFragmentAnimator() -> i
     me.yokeyword.fragmentation.SupportFragmentDelegate getSupportDelegate() -> k
     boolean isSupportVisible() -> m
     void onSupportInvisible() -> n

+ 1 - 1
app/release/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":4,"versionName":"1.0.3","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":6,"versionName":"1.0.5","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

+ 1 - 21
app/src/main/java/me/hegj/wandroid/app/AppLifecyclesImpl.kt

@@ -31,7 +31,6 @@ import com.tencent.bugly.Bugly
 import com.tencent.bugly.crashreport.CrashReport.UserStrategy
 import com.tencent.mmkv.MMKV
 import me.hegj.wandroid.BuildConfig
-import me.hegj.wandroid.R
 import me.hegj.wandroid.app.utils.HttpUtils
 import me.hegj.wandroid.app.weight.loadCallBack.EmptyCallback
 import me.hegj.wandroid.app.weight.loadCallBack.ErrorCallback
@@ -55,25 +54,6 @@ class AppLifecyclesImpl : AppLifecycles {
     }
 
     override fun onCreate(application: Application) {
-        //初始化 SmartSwipeBack
-      /*  SmartSwipeBack.activityBack(application, { activity ->
-            MyActivitySlidingBackConsumer(activity)
-                    .setRelativeMoveFactor(0.5f)
-                    .setScrimColor(-0x80000000)
-                    .setShadowColor(-0x80000000)
-                    .setShadowSize(SmartSwipe.dp2px(20, application))
-                    .setEdgeSize(SmartSwipe.dp2px(20, application))
-                    .enableDirection(DIRECTION_LEFT)
-                    .addListener(object : SimpleSwipeListener() {
-                        override fun onSwipeOpened(wrapper: SmartSwipeWrapper?, consumer: SwipeConsumer?, direction: Int) {
-                            activity.finish()
-                            activity.overridePendingTransition(R.anim.anim_none, R.anim.anim_none)
-                        }
-                    })
-        }, {
-            it !is MainActivity || it is SplashActivity//禁止主Activity滑动返回
-        })*/
-
         //初始化MMKV
         MMKV.initialize(application.filesDir.absolutePath + "/mmkv")
 
@@ -101,7 +81,7 @@ class AppLifecyclesImpl : AppLifecycles {
         val strategy = UserStrategy(context)
         strategy.isUploadProcess = processName == null || processName == packageName
         // 初始化Bugly
-        Bugly.init(context, "xxxx", BuildConfig.DEBUG)
+        Bugly.init(context, "xxx", BuildConfig.DEBUG)
 
         CaocConfig.Builder.create()
                 .backgroundMode(CaocConfig.BACKGROUND_MODE_SILENT) //default: CaocConfig.BACKGROUND_MODE_SHOW_CUSTOM

+ 1 - 1
app/src/main/java/me/hegj/wandroid/app/utils/ColorUtil.kt

@@ -27,7 +27,7 @@ object ColorUtil {
             Color.parseColor("#78909C"))
 
     val PRIMARY_COLORS_SUB = arrayOf(
-            intArrayOf(Color.parseColor("#EF5350"), Color.parseColor("#F44336"), Color.parseColor("#E53935"), Color.parseColor("#D32F2F"), Color.parseColor("#C62828"), Color.parseColor("#B71C1C")),
+            intArrayOf(Color.parseColor("#EF5350"), Color.parseColor("#F44336"), Color.parseColor("#E53935"),Color.parseColor("#e10015"), Color.parseColor("#D32F2F"), Color.parseColor("#C62828"), Color.parseColor("#B71C1C")),
             intArrayOf(Color.parseColor("#EC407A"), Color.parseColor("#E91E63"), Color.parseColor("#D81B60"), Color.parseColor("#C2185B"), Color.parseColor("#AD1457"), Color.parseColor("#880E4F")),
             intArrayOf(Color.parseColor("#AB47BC"), Color.parseColor("#9C27B0"), Color.parseColor("#8E24AA"), Color.parseColor("#7B1FA2"), Color.parseColor("#6A1B9A"), Color.parseColor("#4A148C")),
             intArrayOf(Color.parseColor("#7E57C2"), Color.parseColor("#673AB7"), Color.parseColor("#5E35B1"), Color.parseColor("#512DA8"), Color.parseColor("#4527A0"), Color.parseColor("#311B92")),

+ 26 - 3
app/src/main/java/me/hegj/wandroid/app/utils/DatetimeUtil.kt

@@ -27,15 +27,18 @@ object DatetimeUtil {
     val nows: Date
         get() = formatDate(DATE_PATTERN, now)
 
+
+
     /**
      * Date to Strin
      */
+    @SuppressLint("SimpleDateFormat")
     fun formatDate(date: Date?, formatStyle: String): String {
-        if (date != null) {
+        return if (date != null) {
             val sdf = SimpleDateFormat(formatStyle)
-            return sdf.format(date)
+            sdf.format(date)
         } else {
-            return ""
+            ""
         }
 
     }
@@ -48,6 +51,20 @@ object DatetimeUtil {
         return sdf.format(Date(date))
 
     }
+
+    fun formatDate(formatStyle: String, formatStr: String): Date {
+        val format = SimpleDateFormat(formatStyle, Locale.CHINA)
+        return try {
+            val date = Date()
+            date.time = format.parse(formatStr).time
+            date
+        } catch (e: Exception) {
+            println(e.message)
+            nows
+        }
+
+    }
+
     /**
      * Date to Date
      */
@@ -76,5 +93,11 @@ object DatetimeUtil {
         return Date(lt)
     }
 
+    /**
+     * 获得指定时间的日期
+     */
+    fun getCustomTime(dateStr: String):Date{
+        return formatDate(DATE_PATTERN,dateStr)
+    }
 
 }

+ 21 - 11
app/src/main/java/me/hegj/wandroid/app/utils/SettingUtil.kt

@@ -8,7 +8,6 @@ import android.graphics.drawable.GradientDrawable
 import android.graphics.drawable.StateListDrawable
 import android.os.Build
 import android.preference.PreferenceManager
-import android.util.TypedValue
 import android.view.View
 import android.widget.ProgressBar
 import com.jess.arms.utils.ArmsUtils
@@ -16,6 +15,7 @@ import com.kingja.loadsir.core.LoadService
 import me.hegj.wandroid.R
 import me.hegj.wandroid.app.weight.loadCallBack.LoadingCallback
 import java.lang.reflect.InvocationTargetException
+import kotlin.math.roundToInt
 
 
 object SettingUtil {
@@ -24,12 +24,16 @@ object SettingUtil {
      * 获取主题颜色
      */
     fun getColor(context: Context): Int {
-        val setting = PreferenceManager.getDefaultSharedPreferences(context)
-        val defaultColor = ArmsUtils.getColor(context, R.color.colorPrimary)
-        val color = setting.getInt("color", defaultColor)
-        return if (color != 0 && Color.alpha(color) != 255) {
-            defaultColor
-        } else color
+        return if(isHoliDay()){
+            ArmsUtils.getColor(context, R.color.chinaHoliDay)
+        }else{
+            val setting = PreferenceManager.getDefaultSharedPreferences(context)
+            val defaultColor = ArmsUtils.getColor(context, R.color.colorPrimary)
+            val color = setting.getInt("color", defaultColor)
+            if (color != 0 && Color.alpha(color) != 255) {
+                defaultColor
+            } else color
+        }
     }
 
     /**
@@ -87,7 +91,7 @@ object SettingUtil {
         return ColorStateList(states, colors)
     }
 
-    fun getOneColorStateList(color:Int): ColorStateList {
+    fun getOneColorStateList(color: Int): ColorStateList {
         val colors = intArrayOf(color)
         val states = arrayOfNulls<IntArray>(1)
         states[0] = intArrayOf()
@@ -108,11 +112,12 @@ object SettingUtil {
     /**
      * 设置shap的渐变颜色
      */
-    fun setShapColor(view:View,color:IntArray,orientation: GradientDrawable.Orientation){
+    fun setShapColor(view: View, color: IntArray, orientation: GradientDrawable.Orientation) {
         val drawable = view.background as GradientDrawable
         drawable.orientation = orientation//渐变方向
         drawable.colors = color//渐变颜色数组
     }
+
     /**
      * 设置selector文件的颜色
      *
@@ -157,7 +162,7 @@ object SettingUtil {
      */
     fun translucentColor(color: Int): Int {
         val factor = 0.5f
-        val alpha = Math.round(Color.alpha(color) * factor)
+        val alpha = (Color.alpha(color) * factor).roundToInt()
         val red = Color.red(color)
         val green = Color.green(color)
         val blue = Color.blue(color)
@@ -176,7 +181,12 @@ object SettingUtil {
         }
     }
 
-
+    /**
+     * 判断是否过了国庆节了
+     */
+    fun isHoliDay(): Boolean {
+        return DatetimeUtil.nows <= DatetimeUtil.getCustomTime("2019-10-7")
+    }
 
 
 }

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

@@ -93,10 +93,10 @@ object ShowUtils {
     /**
      * 在屏幕底部吐司 默认
      */
-    fun showToast(context: Context, arg: String) {
-        if (!TextUtils.isEmpty(arg)) {
+    fun showToast(context: Context, msg: String) {
+        if (!TextUtils.isEmpty(msg)) {
             toast?.cancel()
-            toast = Toast.makeText(context.applicationContext, arg, Toast.LENGTH_SHORT).apply {
+            toast = Toast.makeText(context.applicationContext, msg, Toast.LENGTH_SHORT).apply {
                 show()
             }
         }

+ 0 - 20
app/src/main/java/me/hegj/wandroid/app/utils/sliding/MyActivitySlidingBackConsumer.kt

@@ -1,20 +0,0 @@
-package me.hegj.wandroid.app.utils.sliding
-
-import android.app.Activity
-import com.billy.android.swipe.consumer.ActivitySlidingBackConsumer
-import me.hegj.wandroid.app.utils.SettingUtil
-
-/**
- * 自定义滑动返回的 Consum 继承 修改逻辑,当左滑时判断当前有没有开启侧滑返回,没有的话,不允许触发滑动
- */
-class MyActivitySlidingBackConsumer constructor(activity:Activity) :ActivitySlidingBackConsumer(activity) {
-    override fun tryAcceptMoving(pointerId: Int, downX: Float, downY: Float, dx: Float, dy: Float): Boolean {
-        return if(SettingUtil.getSlidable(mActivity)){
-            super.tryAcceptMoving(pointerId, downX, downY, dx, dy)
-        }else{
-            false
-        }
-
-
-    }
-}

+ 11 - 11
app/src/main/java/me/hegj/wandroid/mvp/presenter/main/home/HomePresenter.kt

@@ -1,29 +1,29 @@
 package me.hegj.wandroid.mvp.presenter.main.home
 
 import android.app.Application
-import android.content.Intent
-import android.util.Log
-import androidx.lifecycle.LifecycleOwner
-
-import com.jess.arms.integration.AppManager
 import com.jess.arms.di.scope.FragmentScope
-import com.jess.arms.mvp.BasePresenter
 import com.jess.arms.http.imageloader.ImageLoader
+import com.jess.arms.integration.AppManager
+import com.jess.arms.mvp.BasePresenter
 import com.jess.arms.utils.RxLifecycleUtils
 import com.trello.rxlifecycle2.android.FragmentEvent
+import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.functions.BiFunction
+import io.reactivex.functions.Consumer
 import io.reactivex.schedulers.Schedulers
 import me.hegj.wandroid.app.utils.HttpUtils
 import me.hegj.wandroid.app.utils.SettingUtil
-import me.jessyan.rxerrorhandler.core.RxErrorHandler
-import javax.inject.Inject
-
 import me.hegj.wandroid.mvp.contract.main.home.HomeContract
-import me.hegj.wandroid.mvp.model.entity.*
-import me.hegj.wandroid.mvp.ui.activity.web.WebviewActivity
+import me.hegj.wandroid.mvp.model.entity.ApiPagerResponse
+import me.hegj.wandroid.mvp.model.entity.ApiResponse
+import me.hegj.wandroid.mvp.model.entity.AriticleResponse
+import me.hegj.wandroid.mvp.model.entity.BannerResponse
 import me.hegj.wandroid.mvp.ui.adapter.AriticleAdapter
+import me.jessyan.rxerrorhandler.core.RxErrorHandler
 import me.jessyan.rxerrorhandler.handler.ErrorHandleSubscriber
 import me.jessyan.rxerrorhandler.handler.RetryWithDelay
+import javax.inject.Inject
 
 
 /**

+ 9 - 1
app/src/main/java/me/hegj/wandroid/mvp/ui/activity/main/home/HomeFragment.kt

@@ -31,6 +31,7 @@ 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
@@ -106,7 +107,14 @@ class HomeFragment : BaseFragment<HomePresenter>(), HomeContract.View {
         super.initData(savedInstanceState)
         toolbar.run {
             setBackgroundColor(SettingUtil.getColor(_mActivity))
-            title = "首页"
+            //当前时间时间没有超过10月7号,使用国庆主题
+            if(SettingUtil.isHoliDay()){
+                title = "为祖国母亲庆生"
+                setNavigationIcon(R.drawable.china_day)
+                setNavigationOnClickListener { this@HomeFragment.showMessage("祝老哥国庆节快乐,感谢老哥的支持,没有卸载这个APP,哈哈") }
+            }else{
+                title = "首页"
+            }
             inflateMenu(R.menu.home_menu)
             setOnMenuItemClickListener {
                 when (it.itemId) {

+ 3 - 0
app/src/main/java/me/hegj/wandroid/mvp/ui/activity/setting/GeneralPreferenceFragment.kt

@@ -84,6 +84,9 @@ class GeneralPreferenceFragment : PreferenceFragmentCompat(), SharedPreferences.
                     SettingUtil.setColor(parentActivity, color)
                     //通知其他界面立马修改配置
                     SettingChangeEvent().post()
+                    if(SettingUtil.isHoliDay()){
+                        parentActivity.showMessage("大家一起给祖国母亲庆生,固定大红色走起,10月8号自动恢复正常")
+                    }
                 }
                 positiveButton(R.string.done)
                 negativeButton(R.string.cancel)

BIN
app/src/main/res/drawable-xxxhdpi/china_day.png


+ 1 - 0
app/src/main/res/values/colors.xml

@@ -15,4 +15,5 @@
     <color name="texttipColor">#a0a0a0</color>
     <color name="diverColoe">#cecece</color>
     <color name="accent">#E91E63</color>
+    <color name="chinaHoliDay">#e10015</color>
 </resources>

+ 2 - 4
config.gradle

@@ -5,8 +5,8 @@ ext {
             buildToolsVersion: "28.0.3",
             minSdkVersion    : 21,
             targetSdkVersion : 28,
-            versionCode      : 5,
-            versionName      : "1.0.4"
+            versionCode      : 6,
+            versionName      : "1.0.5"
     ]
 
     version = [
@@ -150,8 +150,6 @@ ext {
             "flow-layout"           : 'com.hyman:flowlayout-lib:1.1.2',
             //高性能通用 key-value 组件
             "mmkv"                  : 'com.tencent:mmkv:1.0.22',
-            //侧滑返回
-            "swipe"                 : 'com.billy.android:smart-swipe:1.0.7',
             //阻止app崩溃
             "customactivityoncrash" : 'cat.ereza:customactivityoncrash:2.2.0',