From 809f19163846f95d2af7843a6e346db1637ddd90 Mon Sep 17 00:00:00 2001 From: puyang1017 Date: Tue, 29 Jan 2019 13:48:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 5 +- .../android/puy/puymvpjava/XDroidConf.java | 6 +- .../puy/puymvpjava/cache/DiskCache.java | 6 +- .../puy/puymvpjava/cache/SharedPref.java | 2 +- .../material/MaterialRippleLayout.java | 2 +- .../pageindicatorview/IndicatorManager.java | 10 +-- .../pageindicatorview/PageIndicatorView.java | 18 +++--- .../animation/AnimationManager.java | 6 +- .../controller/AnimationController.java | 10 +-- .../animation/controller/ValueController.java | 4 +- .../animation/data/AnimationValue.java | 2 +- .../data/type/ColorAnimationValue.java | 2 +- .../data/type/DropAnimationValue.java | 2 +- .../data/type/FillAnimationValue.java | 2 +- .../data/type/ScaleAnimationValue.java | 2 +- .../data/type/SlideAnimationValue.java | 2 +- .../data/type/SwapAnimationValue.java | 2 +- .../data/type/ThinWormAnimationValue.java | 2 +- .../data/type/WormAnimationValue.java | 2 +- .../animation/type/BaseAnimation.java | 2 +- .../animation/type/ColorAnimation.java | 4 +- .../animation/type/DropAnimation.java | 4 +- .../animation/type/FillAnimation.java | 4 +- .../animation/type/ScaleAnimation.java | 4 +- .../animation/type/ScaleDownAnimation.java | 2 +- .../animation/type/SlideAnimation.java | 4 +- .../animation/type/SwapAnimation.java | 4 +- .../animation/type/ThinWormAnimation.java | 4 +- .../animation/type/WormAnimation.java | 4 +- .../pageindicatorview/draw/DrawManager.java | 10 +-- .../draw/controller/AttributeController.java | 12 ++-- .../draw/controller/DrawController.java | 10 +-- .../draw/controller/MeasureController.java | 6 +- .../draw/data/Indicator.java | 2 +- .../pageindicatorview/draw/drawer/Drawer.java | 6 +- .../draw/drawer/type/BaseDrawer.java | 2 +- .../draw/drawer/type/BasicDrawer.java | 4 +- .../draw/drawer/type/ColorDrawer.java | 6 +- .../draw/drawer/type/DropDrawer.java | 8 +-- .../draw/drawer/type/FillDrawer.java | 6 +- .../draw/drawer/type/ScaleDownDrawer.java | 6 +- .../draw/drawer/type/ScaleDrawer.java | 6 +- .../draw/drawer/type/SlideDrawer.java | 8 +-- .../draw/drawer/type/SwapDrawer.java | 8 +-- .../draw/drawer/type/ThinWormDrawer.java | 8 +-- .../draw/drawer/type/WormDrawer.java | 8 +-- .../utils/CoordinatesUtils.java | 6 +- .../puy/puymvpjava/imageloader/ILoader.java | 2 +- .../android/puy/puymvpjava/log/LogFormat.java | 2 +- .../com/android/puy/puymvpjava/log/XLog.java | 2 +- .../android/puy/puymvpjava/mqttv3/MqttV3.java | 2 +- .../android/puy/puymvpjava/mvp/XActivity.java | 8 +-- .../puy/puymvpjava/mvp/XBackActivity.java | 10 +-- .../android/puy/puymvpjava/mvp/XFragment.java | 8 +-- .../puy/puymvpjava/mvp/XFragmentation.java | 8 +-- .../mvp/XFragmentationActivity.java | 8 +-- .../puy/puymvpjava/mvp/XLazyFragment.java | 8 +-- .../puy/puymvpjava/mvp/XLazyFragmention.java | 8 +-- .../puy/puymvpjava/net/LogInterceptor.java | 2 +- .../com/android/puy/puymvpjava/net/XApi.java | 4 +- .../net/cookie/PersistentCookieStore.java | 2 +- .../net/progress/ProgressHelper.java | 2 +- .../android/puy/puymvpjava/router/Router.java | 2 +- .../puymvpjava/threadpool/ThreadPoolHelp.java | 2 +- .../threadpool/builder/CachedBuilder.java | 2 +- .../threadpool/builder/CustomBuilder.java | 2 +- .../threadpool/builder/FixedBuilder.java | 2 +- .../threadpool/builder/ScheduledBuilder.java | 2 +- .../threadpool/builder/SingleBuilder.java | 2 +- .../threadpool/builder/ThreadPoolBuilder.java | 2 +- .../src/main/res/layout/swipeback_layout.xml | 5 ++ puymvpjava/src/main/res/values/attrs.xml | 63 +++++++++++++++++++ puymvpjava/src/main/res/values/colors.xml | 5 ++ puymvpjava/src/main/res/values/strings.xml | 2 +- 74 files changed, 243 insertions(+), 169 deletions(-) create mode 100644 puymvpjava/src/main/res/layout/swipeback_layout.xml create mode 100644 puymvpjava/src/main/res/values/attrs.xml create mode 100644 puymvpjava/src/main/res/values/colors.xml diff --git a/app/build.gradle b/app/build.gradle index 73aeffa..425ab79 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,11 +23,12 @@ android { } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation fileTree(include: ['*.jar'], dir: 'libs') + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'com.android.support:appcompat-v7:28.0.0' implementation 'com.android.support.constraint:constraint-layout:1.1.3' testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + implementation project(':puymvpjava') } diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/XDroidConf.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/XDroidConf.java index bdc504f..e2b0dd3 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/XDroidConf.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/XDroidConf.java @@ -1,8 +1,8 @@ package com.android.puy.puymvpjava; -import cn.droidlover.xdroidmvp.imageloader.ILoader; -import cn.droidlover.xdroidmvp.kit.Kits; -import cn.droidlover.xdroidmvp.router.Router; +import com.android.puy.puymvpjava.imageloader.ILoader; +import com.android.puy.puymvpjava.kit.Kits; +import com.android.puy.puymvpjava.router.Router; public class XDroidConf { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/cache/DiskCache.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/cache/DiskCache.java index d3bae42..86e0db7 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/cache/DiskCache.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/cache/DiskCache.java @@ -3,9 +3,9 @@ import android.content.Context; import android.os.Environment; import android.text.TextUtils; -import cn.droidlover.xdroidmvp.XDroidConf; -import cn.droidlover.xdroidmvp.kit.Codec; -import cn.droidlover.xdroidmvp.kit.Kits; +import com.android.puy.puymvpjava.XDroidConf; +import com.android.puy.puymvpjava.kit.Codec; +import com.android.puy.puymvpjava.kit.Kits; import java.io.File; import java.io.IOException; diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/cache/SharedPref.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/cache/SharedPref.java index 48cd0dc..bc26e2f 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/cache/SharedPref.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/cache/SharedPref.java @@ -2,7 +2,7 @@ import android.content.Context; import android.content.SharedPreferences; -import cn.droidlover.xdroidmvp.XDroidConf; +import com.android.puy.puymvpjava.XDroidConf; public class SharedPref implements ICache { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/material/MaterialRippleLayout.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/material/MaterialRippleLayout.java index 1528c9d..e0030df 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/material/MaterialRippleLayout.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/material/MaterialRippleLayout.java @@ -20,7 +20,7 @@ import android.view.animation.LinearInterpolator; import android.widget.AdapterView; import android.widget.FrameLayout; -import cn.droidlover.xdroidmvp.R; +import com.android.puy.puymvpjava.R; import static android.view.GestureDetector.SimpleOnGestureListener; import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/IndicatorManager.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/IndicatorManager.java index 70cec7c..66e55d6 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/IndicatorManager.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/IndicatorManager.java @@ -1,11 +1,11 @@ package com.android.puy.puymvpjava.customs.pageindicatorview; import android.support.annotation.Nullable; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.AnimationManager; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.controller.ValueController; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.data.Value; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.draw.DrawManager; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.draw.data.Indicator; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.AnimationManager; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.controller.ValueController; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.Value; +import com.android.puy.puymvpjava.customs.pageindicatorview.draw.DrawManager; +import com.android.puy.puymvpjava.customs.pageindicatorview.draw.data.Indicator; public class IndicatorManager implements ValueController.UpdateListener { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/PageIndicatorView.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/PageIndicatorView.java index 6e3022b..6d1b2a5 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/PageIndicatorView.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/PageIndicatorView.java @@ -21,15 +21,15 @@ import android.view.View; import android.view.ViewGroup; import android.view.ViewParent; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.type.*; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.draw.controller.DrawController; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.draw.data.Indicator; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.draw.data.Orientation; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.draw.data.PositionSavedState; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.draw.data.RtlMode; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.utils.CoordinatesUtils; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.utils.DensityUtils; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.utils.IdUtils; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.type.*; +import com.android.puy.puymvpjava.customs.pageindicatorview.draw.controller.DrawController; +import com.android.puy.puymvpjava.customs.pageindicatorview.draw.data.Indicator; +import com.android.puy.puymvpjava.customs.pageindicatorview.draw.data.Orientation; +import com.android.puy.puymvpjava.customs.pageindicatorview.draw.data.PositionSavedState; +import com.android.puy.puymvpjava.customs.pageindicatorview.draw.data.RtlMode; +import com.android.puy.puymvpjava.customs.pageindicatorview.utils.CoordinatesUtils; +import com.android.puy.puymvpjava.customs.pageindicatorview.utils.DensityUtils; +import com.android.puy.puymvpjava.customs.pageindicatorview.utils.IdUtils; public class PageIndicatorView extends View implements ViewPager.OnPageChangeListener, IndicatorManager.Listener, ViewPager.OnAdapterChangeListener, View.OnTouchListener { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/AnimationManager.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/AnimationManager.java index 7473cfd..af47f01 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/AnimationManager.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/AnimationManager.java @@ -1,9 +1,9 @@ package com.android.puy.puymvpjava.customs.pageindicatorview.animation; import android.support.annotation.NonNull; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.controller.AnimationController; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.controller.ValueController; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.draw.data.Indicator; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.controller.AnimationController; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.controller.ValueController; +import com.android.puy.puymvpjava.customs.pageindicatorview.draw.data.Indicator; public class AnimationManager { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/controller/AnimationController.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/controller/AnimationController.java index 5addee1..07eed43 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/controller/AnimationController.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/controller/AnimationController.java @@ -1,11 +1,11 @@ package com.android.puy.puymvpjava.customs.pageindicatorview.animation.controller; import android.support.annotation.NonNull; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.type.AnimationType; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.type.BaseAnimation; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.draw.data.Indicator; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.draw.data.Orientation; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.utils.CoordinatesUtils; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.type.AnimationType; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.type.BaseAnimation; +import com.android.puy.puymvpjava.customs.pageindicatorview.draw.data.Indicator; +import com.android.puy.puymvpjava.customs.pageindicatorview.draw.data.Orientation; +import com.android.puy.puymvpjava.customs.pageindicatorview.utils.CoordinatesUtils; public class AnimationController { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/controller/ValueController.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/controller/ValueController.java index 48c98a0..9796e7f 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/controller/ValueController.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/controller/ValueController.java @@ -2,8 +2,8 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.data.Value; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.type.*; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.Value; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.type.*; public class ValueController { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/data/AnimationValue.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/data/AnimationValue.java index 9f361f0..e4a44d4 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/data/AnimationValue.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/data/AnimationValue.java @@ -1,7 +1,7 @@ package com.android.puy.puymvpjava.customs.pageindicatorview.animation.data; import android.support.annotation.NonNull; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.data.type.*; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.type.*; public class AnimationValue { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/data/type/ColorAnimationValue.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/data/type/ColorAnimationValue.java index a9cf7c3..82ad450 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/data/type/ColorAnimationValue.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/data/type/ColorAnimationValue.java @@ -1,7 +1,7 @@ package com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.type; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.data.Value; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.Value; public class ColorAnimationValue implements Value { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/data/type/DropAnimationValue.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/data/type/DropAnimationValue.java index 3046366..2afbfe8 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/data/type/DropAnimationValue.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/data/type/DropAnimationValue.java @@ -1,7 +1,7 @@ package com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.type; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.data.Value; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.Value; public class DropAnimationValue implements Value { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/data/type/FillAnimationValue.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/data/type/FillAnimationValue.java index 14b8c55..7c50e7a 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/data/type/FillAnimationValue.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/data/type/FillAnimationValue.java @@ -1,7 +1,7 @@ package com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.type; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.data.Value; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.Value; public class FillAnimationValue extends ColorAnimationValue implements Value { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/data/type/ScaleAnimationValue.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/data/type/ScaleAnimationValue.java index abd2e24..6e6bdae 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/data/type/ScaleAnimationValue.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/data/type/ScaleAnimationValue.java @@ -1,7 +1,7 @@ package com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.type; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.data.Value; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.Value; public class ScaleAnimationValue extends ColorAnimationValue implements Value { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/data/type/SlideAnimationValue.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/data/type/SlideAnimationValue.java index 3b40b2d..5a398d2 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/data/type/SlideAnimationValue.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/data/type/SlideAnimationValue.java @@ -1,7 +1,7 @@ package com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.type; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.data.Value; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.Value; public class SlideAnimationValue implements Value { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/data/type/SwapAnimationValue.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/data/type/SwapAnimationValue.java index 4f19d30..52f4c08 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/data/type/SwapAnimationValue.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/data/type/SwapAnimationValue.java @@ -1,7 +1,7 @@ package com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.type; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.data.Value; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.Value; public class SwapAnimationValue implements Value { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/data/type/ThinWormAnimationValue.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/data/type/ThinWormAnimationValue.java index 0485823..11f2b60 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/data/type/ThinWormAnimationValue.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/data/type/ThinWormAnimationValue.java @@ -1,7 +1,7 @@ package com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.type; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.data.Value; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.Value; public class ThinWormAnimationValue extends WormAnimationValue implements Value { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/data/type/WormAnimationValue.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/data/type/WormAnimationValue.java index 8c7ff00..bcb701b 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/data/type/WormAnimationValue.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/data/type/WormAnimationValue.java @@ -1,7 +1,7 @@ package com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.type; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.data.Value; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.Value; public class WormAnimationValue implements Value { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/type/BaseAnimation.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/type/BaseAnimation.java index 13db7ed..9d791b5 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/type/BaseAnimation.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/type/BaseAnimation.java @@ -4,7 +4,7 @@ import android.animation.ValueAnimator; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.controller.ValueController; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.controller.ValueController; public abstract class BaseAnimation { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/type/ColorAnimation.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/type/ColorAnimation.java index fcb73a7..248b3ac 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/type/ColorAnimation.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/type/ColorAnimation.java @@ -6,8 +6,8 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.view.animation.AccelerateDecelerateInterpolator; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.controller.ValueController; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.data.type.ColorAnimationValue; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.controller.ValueController; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.type.ColorAnimationValue; public class ColorAnimation extends BaseAnimation { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/type/DropAnimation.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/type/DropAnimation.java index d06a16a..fbe9748 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/type/DropAnimation.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/type/DropAnimation.java @@ -5,8 +5,8 @@ import android.animation.ValueAnimator; import android.support.annotation.NonNull; import android.view.animation.AccelerateDecelerateInterpolator; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.controller.ValueController; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.data.type.DropAnimationValue; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.controller.ValueController; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.type.DropAnimationValue; public class DropAnimation extends BaseAnimation { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/type/FillAnimation.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/type/FillAnimation.java index 1a78b79..03d4896 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/type/FillAnimation.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/type/FillAnimation.java @@ -5,8 +5,8 @@ import android.animation.ValueAnimator; import android.support.annotation.NonNull; import android.view.animation.AccelerateDecelerateInterpolator; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.controller.ValueController; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.data.type.FillAnimationValue; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.controller.ValueController; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.type.FillAnimationValue; public class FillAnimation extends ColorAnimation { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/type/ScaleAnimation.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/type/ScaleAnimation.java index 712554e..13cd039 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/type/ScaleAnimation.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/type/ScaleAnimation.java @@ -5,8 +5,8 @@ import android.animation.ValueAnimator; import android.support.annotation.NonNull; import android.view.animation.AccelerateDecelerateInterpolator; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.controller.ValueController; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.data.type.ScaleAnimationValue; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.controller.ValueController; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.type.ScaleAnimationValue; public class ScaleAnimation extends ColorAnimation { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/type/ScaleDownAnimation.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/type/ScaleDownAnimation.java index 2948a94..f6145e9 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/type/ScaleDownAnimation.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/type/ScaleDownAnimation.java @@ -3,7 +3,7 @@ import android.animation.IntEvaluator; import android.animation.PropertyValuesHolder; import android.support.annotation.NonNull; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.controller.ValueController; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.controller.ValueController; public class ScaleDownAnimation extends ScaleAnimation { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/type/SlideAnimation.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/type/SlideAnimation.java index e466ab0..f04f0ad 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/type/SlideAnimation.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/type/SlideAnimation.java @@ -5,8 +5,8 @@ import android.animation.ValueAnimator; import android.support.annotation.NonNull; import android.view.animation.AccelerateDecelerateInterpolator; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.controller.ValueController; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.data.type.SlideAnimationValue; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.controller.ValueController; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.type.SlideAnimationValue; public class SlideAnimation extends BaseAnimation { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/type/SwapAnimation.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/type/SwapAnimation.java index 4ff9811..1cd5855 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/type/SwapAnimation.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/type/SwapAnimation.java @@ -5,8 +5,8 @@ import android.animation.ValueAnimator; import android.support.annotation.NonNull; import android.view.animation.AccelerateDecelerateInterpolator; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.controller.ValueController; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.data.type.SwapAnimationValue; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.controller.ValueController; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.type.SwapAnimationValue; public class SwapAnimation extends BaseAnimation { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/type/ThinWormAnimation.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/type/ThinWormAnimation.java index b72cae1..d417bfb 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/type/ThinWormAnimation.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/type/ThinWormAnimation.java @@ -3,8 +3,8 @@ import android.animation.ValueAnimator; import android.support.annotation.NonNull; import android.view.animation.AccelerateDecelerateInterpolator; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.controller.ValueController; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.data.type.ThinWormAnimationValue; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.controller.ValueController; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.type.ThinWormAnimationValue; public class ThinWormAnimation extends WormAnimation { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/type/WormAnimation.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/type/WormAnimation.java index 3f78866..c5bc17c 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/type/WormAnimation.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/animation/type/WormAnimation.java @@ -5,8 +5,8 @@ import android.animation.ValueAnimator; import android.support.annotation.NonNull; import android.view.animation.AccelerateDecelerateInterpolator; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.controller.ValueController; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.data.type.WormAnimationValue; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.controller.ValueController; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.type.WormAnimationValue; public class WormAnimation extends BaseAnimation { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/DrawManager.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/DrawManager.java index 146dffd..8a88bd6 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/DrawManager.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/DrawManager.java @@ -7,11 +7,11 @@ import android.util.AttributeSet; import android.util.Pair; import android.view.MotionEvent; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.data.Value; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.draw.controller.AttributeController; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.draw.controller.DrawController; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.draw.controller.MeasureController; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.draw.data.Indicator; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.Value; +import com.android.puy.puymvpjava.customs.pageindicatorview.draw.controller.AttributeController; +import com.android.puy.puymvpjava.customs.pageindicatorview.draw.controller.DrawController; +import com.android.puy.puymvpjava.customs.pageindicatorview.draw.controller.MeasureController; +import com.android.puy.puymvpjava.customs.pageindicatorview.draw.data.Indicator; public class DrawManager { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/controller/AttributeController.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/controller/AttributeController.java index 5c9f582..28cdabd 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/controller/AttributeController.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/controller/AttributeController.java @@ -7,12 +7,12 @@ import android.support.annotation.Nullable; import android.util.AttributeSet; import android.view.View; -import cn.droidlover.xdroidmvp.R; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.type.*; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.draw.data.Indicator; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.draw.data.Orientation; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.draw.data.RtlMode; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.utils.DensityUtils; +import com.android.puy.puymvpjava.R; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.type.*; +import com.android.puy.puymvpjava.customs.pageindicatorview.draw.data.Indicator; +import com.android.puy.puymvpjava.customs.pageindicatorview.draw.data.Orientation; +import com.android.puy.puymvpjava.customs.pageindicatorview.draw.data.RtlMode; +import com.android.puy.puymvpjava.customs.pageindicatorview.utils.DensityUtils; public class AttributeController { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/controller/DrawController.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/controller/DrawController.java index 9463bc5..7d5ef60 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/controller/DrawController.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/controller/DrawController.java @@ -4,11 +4,11 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.view.MotionEvent; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.data.Value; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.type.AnimationType; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.draw.data.Indicator; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.draw.drawer.Drawer; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.utils.CoordinatesUtils; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.Value; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.type.AnimationType; +import com.android.puy.puymvpjava.customs.pageindicatorview.draw.data.Indicator; +import com.android.puy.puymvpjava.customs.pageindicatorview.draw.drawer.Drawer; +import com.android.puy.puymvpjava.customs.pageindicatorview.utils.CoordinatesUtils; public class DrawController { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/controller/MeasureController.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/controller/MeasureController.java index c5c53d4..ea1c144 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/controller/MeasureController.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/controller/MeasureController.java @@ -3,9 +3,9 @@ import android.support.annotation.NonNull; import android.util.Pair; import android.view.View; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.type.AnimationType; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.draw.data.Indicator; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.draw.data.Orientation; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.type.AnimationType; +import com.android.puy.puymvpjava.customs.pageindicatorview.draw.data.Indicator; +import com.android.puy.puymvpjava.customs.pageindicatorview.draw.data.Orientation; public class MeasureController { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/data/Indicator.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/data/Indicator.java index e87744e..a87c127 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/data/Indicator.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/data/Indicator.java @@ -2,7 +2,7 @@ import android.support.annotation.NonNull; import android.view.View; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.type.AnimationType; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.type.AnimationType; public class Indicator { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/Drawer.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/Drawer.java index 1e3e6e6..bdcc456 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/Drawer.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/Drawer.java @@ -3,9 +3,9 @@ import android.graphics.Canvas; import android.graphics.Paint; import android.support.annotation.NonNull; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.data.Value; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.draw.data.Indicator; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.draw.drawer.type.*; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.Value; +import com.android.puy.puymvpjava.customs.pageindicatorview.draw.data.Indicator; +import com.android.puy.puymvpjava.customs.pageindicatorview.draw.drawer.type.*; public class Drawer { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/BaseDrawer.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/BaseDrawer.java index b7da843..54c2243 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/BaseDrawer.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/BaseDrawer.java @@ -2,7 +2,7 @@ import android.graphics.Paint; import android.support.annotation.NonNull; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.draw.data.Indicator; +import com.android.puy.puymvpjava.customs.pageindicatorview.draw.data.Indicator; class BaseDrawer { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/BasicDrawer.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/BasicDrawer.java index 05a708e..c9b5cd7 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/BasicDrawer.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/BasicDrawer.java @@ -3,8 +3,8 @@ import android.graphics.Canvas; import android.graphics.Paint; import android.support.annotation.NonNull; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.type.AnimationType; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.draw.data.Indicator; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.type.AnimationType; +import com.android.puy.puymvpjava.customs.pageindicatorview.draw.data.Indicator; public class BasicDrawer extends BaseDrawer { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/ColorDrawer.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/ColorDrawer.java index 911948a..365b031 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/ColorDrawer.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/ColorDrawer.java @@ -3,9 +3,9 @@ import android.graphics.Canvas; import android.graphics.Paint; import android.support.annotation.NonNull; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.data.Value; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.data.type.ColorAnimationValue; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.draw.data.Indicator; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.Value; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.type.ColorAnimationValue; +import com.android.puy.puymvpjava.customs.pageindicatorview.draw.data.Indicator; public class ColorDrawer extends BaseDrawer { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/DropDrawer.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/DropDrawer.java index 611db54..98df097 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/DropDrawer.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/DropDrawer.java @@ -3,10 +3,10 @@ import android.graphics.Canvas; import android.graphics.Paint; import android.support.annotation.NonNull; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.data.Value; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.data.type.DropAnimationValue; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.draw.data.Indicator; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.draw.data.Orientation; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.Value; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.type.DropAnimationValue; +import com.android.puy.puymvpjava.customs.pageindicatorview.draw.data.Indicator; +import com.android.puy.puymvpjava.customs.pageindicatorview.draw.data.Orientation; public class DropDrawer extends BaseDrawer { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/FillDrawer.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/FillDrawer.java index 26f7798..5349f46 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/FillDrawer.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/FillDrawer.java @@ -3,9 +3,9 @@ import android.graphics.Canvas; import android.graphics.Paint; import android.support.annotation.NonNull; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.data.Value; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.data.type.FillAnimationValue; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.draw.data.Indicator; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.Value; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.type.FillAnimationValue; +import com.android.puy.puymvpjava.customs.pageindicatorview.draw.data.Indicator; public class FillDrawer extends BaseDrawer { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/ScaleDownDrawer.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/ScaleDownDrawer.java index 2528387..fbcee2f 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/ScaleDownDrawer.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/ScaleDownDrawer.java @@ -3,9 +3,9 @@ import android.graphics.Canvas; import android.graphics.Paint; import android.support.annotation.NonNull; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.data.Value; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.data.type.ScaleAnimationValue; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.draw.data.Indicator; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.Value; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.type.ScaleAnimationValue; +import com.android.puy.puymvpjava.customs.pageindicatorview.draw.data.Indicator; public class ScaleDownDrawer extends BaseDrawer { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/ScaleDrawer.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/ScaleDrawer.java index eebc29c..f588011 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/ScaleDrawer.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/ScaleDrawer.java @@ -3,9 +3,9 @@ import android.graphics.Canvas; import android.graphics.Paint; import android.support.annotation.NonNull; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.data.Value; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.data.type.ScaleAnimationValue; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.draw.data.Indicator; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.Value; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.type.ScaleAnimationValue; +import com.android.puy.puymvpjava.customs.pageindicatorview.draw.data.Indicator; public class ScaleDrawer extends BaseDrawer { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/SlideDrawer.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/SlideDrawer.java index 767b8d1..13ec930 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/SlideDrawer.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/SlideDrawer.java @@ -3,10 +3,10 @@ import android.graphics.Canvas; import android.graphics.Paint; import android.support.annotation.NonNull; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.data.Value; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.data.type.SlideAnimationValue; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.draw.data.Indicator; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.draw.data.Orientation; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.Value; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.type.SlideAnimationValue; +import com.android.puy.puymvpjava.customs.pageindicatorview.draw.data.Indicator; +import com.android.puy.puymvpjava.customs.pageindicatorview.draw.data.Orientation; public class SlideDrawer extends BaseDrawer { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/SwapDrawer.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/SwapDrawer.java index d9e2db3..21b7d00 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/SwapDrawer.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/SwapDrawer.java @@ -3,10 +3,10 @@ import android.graphics.Canvas; import android.graphics.Paint; import android.support.annotation.NonNull; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.data.Value; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.data.type.SwapAnimationValue; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.draw.data.Indicator; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.draw.data.Orientation; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.Value; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.type.SwapAnimationValue; +import com.android.puy.puymvpjava.customs.pageindicatorview.draw.data.Indicator; +import com.android.puy.puymvpjava.customs.pageindicatorview.draw.data.Orientation; public class SwapDrawer extends BaseDrawer { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/ThinWormDrawer.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/ThinWormDrawer.java index 882c002..bacfa85 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/ThinWormDrawer.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/ThinWormDrawer.java @@ -3,10 +3,10 @@ import android.graphics.Canvas; import android.graphics.Paint; import android.support.annotation.NonNull; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.data.Value; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.data.type.ThinWormAnimationValue; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.draw.data.Indicator; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.draw.data.Orientation; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.Value; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.type.ThinWormAnimationValue; +import com.android.puy.puymvpjava.customs.pageindicatorview.draw.data.Indicator; +import com.android.puy.puymvpjava.customs.pageindicatorview.draw.data.Orientation; public class ThinWormDrawer extends WormDrawer { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/WormDrawer.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/WormDrawer.java index 28aed22..21f5d02 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/WormDrawer.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/draw/drawer/type/WormDrawer.java @@ -4,10 +4,10 @@ import android.graphics.Paint; import android.graphics.RectF; import android.support.annotation.NonNull; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.data.Value; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.data.type.WormAnimationValue; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.draw.data.Indicator; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.draw.data.Orientation; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.Value; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.data.type.WormAnimationValue; +import com.android.puy.puymvpjava.customs.pageindicatorview.draw.data.Indicator; +import com.android.puy.puymvpjava.customs.pageindicatorview.draw.data.Orientation; public class WormDrawer extends BaseDrawer { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/utils/CoordinatesUtils.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/utils/CoordinatesUtils.java index e8d4006..a0932ee 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/utils/CoordinatesUtils.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/customs/pageindicatorview/utils/CoordinatesUtils.java @@ -3,9 +3,9 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.util.Pair; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.animation.type.AnimationType; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.draw.data.Indicator; -import cn.droidlover.xdroidmvp.customs.pageindicatorview.draw.data.Orientation; +import com.android.puy.puymvpjava.customs.pageindicatorview.animation.type.AnimationType; +import com.android.puy.puymvpjava.customs.pageindicatorview.draw.data.Indicator; +import com.android.puy.puymvpjava.customs.pageindicatorview.draw.data.Orientation; public class CoordinatesUtils { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/imageloader/ILoader.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/imageloader/ILoader.java index ed216f6..b6d81ae 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/imageloader/ILoader.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/imageloader/ILoader.java @@ -3,7 +3,7 @@ import android.content.Context; import android.graphics.drawable.Drawable; import android.widget.ImageView; -import cn.droidlover.xdroidmvp.XDroidConf; +import com.android.puy.puymvpjava.XDroidConf; import java.io.File; diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/log/LogFormat.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/log/LogFormat.java index efc9b80..0f06b3e 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/log/LogFormat.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/log/LogFormat.java @@ -1,6 +1,6 @@ package com.android.puy.puymvpjava.log; -import cn.droidlover.xdroidmvp.kit.Kits; +import com.android.puy.puymvpjava.kit.Kits; import org.json.JSONArray; import org.json.JSONObject; diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/log/XLog.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/log/XLog.java index b31ef6a..4ffe6c1 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/log/XLog.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/log/XLog.java @@ -2,7 +2,7 @@ import android.text.TextUtils; import android.util.Log; -import cn.droidlover.xdroidmvp.XDroidConf; +import com.android.puy.puymvpjava.XDroidConf; public class XLog { diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/mqttv3/MqttV3.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/mqttv3/MqttV3.java index ad86980..c836bbd 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/mqttv3/MqttV3.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/mqttv3/MqttV3.java @@ -8,7 +8,7 @@ import java.security.NoSuchAlgorithmException; import java.util.List; -import static cn.droidlover.xdroidmvp.mqttv3.MacSignature.macSignature; +import static com.android.puy.puymvpjava.mqttv3.MacSignature.macSignature; /** * mqttv3 封装类 diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/mvp/XActivity.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/mvp/XActivity.java index d2b80ce..498f9e4 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/mvp/XActivity.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/mvp/XActivity.java @@ -6,10 +6,10 @@ import android.view.Menu; import android.view.View; import butterknife.Unbinder; -import cn.droidlover.xdroidmvp.XDroidConf; -import cn.droidlover.xdroidmvp.customs.material.MaterialRippleLayout; -import cn.droidlover.xdroidmvp.event.BusProvider; -import cn.droidlover.xdroidmvp.kit.KnifeKit; +import com.android.puy.puymvpjava.XDroidConf; +import com.android.puy.puymvpjava.customs.material.MaterialRippleLayout; +import com.android.puy.puymvpjava.event.BusProvider; +import com.android.puy.puymvpjava.kit.KnifeKit; import com.gyf.barlibrary.ImmersionBar; import com.tbruyelle.rxpermissions2.RxPermissions; import com.trello.rxlifecycle2.components.support.RxAppCompatActivity; diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/mvp/XBackActivity.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/mvp/XBackActivity.java index 93117c2..da522ae 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/mvp/XBackActivity.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/mvp/XBackActivity.java @@ -6,11 +6,11 @@ import android.view.Menu; import android.view.View; import butterknife.Unbinder; -import cn.droidlover.xdroidmvp.XDroidConf; -import cn.droidlover.xdroidmvp.customs.SwipeBackActivity; -import cn.droidlover.xdroidmvp.customs.material.MaterialRippleLayout; -import cn.droidlover.xdroidmvp.event.BusProvider; -import cn.droidlover.xdroidmvp.kit.KnifeKit; +import com.android.puy.puymvpjava.XDroidConf; +import com.android.puy.puymvpjava.customs.SwipeBackActivity; +import com.android.puy.puymvpjava.customs.material.MaterialRippleLayout; +import com.android.puy.puymvpjava.event.BusProvider; +import com.android.puy.puymvpjava.kit.KnifeKit; import com.gyf.barlibrary.ImmersionBar; import com.tbruyelle.rxpermissions2.RxPermissions; import com.umeng.analytics.MobclickAgent; diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/mvp/XFragment.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/mvp/XFragment.java index 7b3cd7e..1e93da7 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/mvp/XFragment.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/mvp/XFragment.java @@ -9,10 +9,10 @@ import android.view.View; import android.view.ViewGroup; import butterknife.Unbinder; -import cn.droidlover.xdroidmvp.XDroidConf; -import cn.droidlover.xdroidmvp.customs.material.MaterialRippleLayout; -import cn.droidlover.xdroidmvp.event.BusProvider; -import cn.droidlover.xdroidmvp.kit.KnifeKit; +import com.android.puy.puymvpjava.XDroidConf; +import com.android.puy.puymvpjava.customs.material.MaterialRippleLayout; +import com.android.puy.puymvpjava.event.BusProvider; +import com.android.puy.puymvpjava.kit.KnifeKit; import com.tbruyelle.rxpermissions2.RxPermissions; import com.trello.rxlifecycle2.components.support.RxFragment; import org.greenrobot.eventbus.EventBus; diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/mvp/XFragmentation.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/mvp/XFragmentation.java index f81f5de..32de617 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/mvp/XFragmentation.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/mvp/XFragmentation.java @@ -9,10 +9,10 @@ import android.view.View; import android.view.ViewGroup; import butterknife.Unbinder; -import cn.droidlover.xdroidmvp.XDroidConf; -import cn.droidlover.xdroidmvp.customs.material.MaterialRippleLayout; -import cn.droidlover.xdroidmvp.event.BusProvider; -import cn.droidlover.xdroidmvp.kit.KnifeKit; +import com.android.puy.puymvpjava.XDroidConf; +import com.android.puy.puymvpjava.customs.material.MaterialRippleLayout; +import com.android.puy.puymvpjava.event.BusProvider; +import com.android.puy.puymvpjava.kit.KnifeKit; import com.tbruyelle.rxpermissions2.RxPermissions; import me.yokeyword.fragmentation.SupportFragment; import org.greenrobot.eventbus.EventBus; diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/mvp/XFragmentationActivity.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/mvp/XFragmentationActivity.java index 68ea2bf..3428f43 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/mvp/XFragmentationActivity.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/mvp/XFragmentationActivity.java @@ -6,10 +6,10 @@ import android.view.Menu; import android.view.View; import butterknife.Unbinder; -import cn.droidlover.xdroidmvp.XDroidConf; -import cn.droidlover.xdroidmvp.customs.material.MaterialRippleLayout; -import cn.droidlover.xdroidmvp.event.BusProvider; -import cn.droidlover.xdroidmvp.kit.KnifeKit; +import com.android.puy.puymvpjava.XDroidConf; +import com.android.puy.puymvpjava.customs.material.MaterialRippleLayout; +import com.android.puy.puymvpjava.event.BusProvider; +import com.android.puy.puymvpjava.kit.KnifeKit; import com.gyf.barlibrary.ImmersionBar; import com.tbruyelle.rxpermissions2.RxPermissions; import com.umeng.analytics.MobclickAgent; diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/mvp/XLazyFragment.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/mvp/XLazyFragment.java index 976eb7c..8239045 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/mvp/XLazyFragment.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/mvp/XLazyFragment.java @@ -4,10 +4,10 @@ import android.os.Bundle; import android.view.View; import butterknife.Unbinder; -import cn.droidlover.xdroidmvp.XDroidConf; -import cn.droidlover.xdroidmvp.customs.material.MaterialRippleLayout; -import cn.droidlover.xdroidmvp.event.BusProvider; -import cn.droidlover.xdroidmvp.kit.KnifeKit; +import com.android.puy.puymvpjava.XDroidConf; +import com.android.puy.puymvpjava.customs.material.MaterialRippleLayout; +import com.android.puy.puymvpjava.event.BusProvider; +import com.android.puy.puymvpjava.kit.KnifeKit; import com.tbruyelle.rxpermissions2.RxPermissions; import org.greenrobot.eventbus.EventBus; diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/mvp/XLazyFragmention.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/mvp/XLazyFragmention.java index b3c4f97..0533798 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/mvp/XLazyFragmention.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/mvp/XLazyFragmention.java @@ -4,10 +4,10 @@ import android.os.Bundle; import android.view.View; import butterknife.Unbinder; -import cn.droidlover.xdroidmvp.XDroidConf; -import cn.droidlover.xdroidmvp.customs.material.MaterialRippleLayout; -import cn.droidlover.xdroidmvp.event.BusProvider; -import cn.droidlover.xdroidmvp.kit.KnifeKit; +import com.android.puy.puymvpjava.XDroidConf; +import com.android.puy.puymvpjava.customs.material.MaterialRippleLayout; +import com.android.puy.puymvpjava.event.BusProvider; +import com.android.puy.puymvpjava.kit.KnifeKit; import com.tbruyelle.rxpermissions2.RxPermissions; import org.greenrobot.eventbus.EventBus; diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/net/LogInterceptor.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/net/LogInterceptor.java index e91c0e3..24b4112 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/net/LogInterceptor.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/net/LogInterceptor.java @@ -1,7 +1,7 @@ package com.android.puy.puymvpjava.net; import android.util.Log; -import cn.droidlover.xdroidmvp.log.XLog; +import com.android.puy.puymvpjava.log.XLog; import okhttp3.*; import okio.Buffer; diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/net/XApi.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/net/XApi.java index 63dacc5..23d7a3a 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/net/XApi.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/net/XApi.java @@ -1,7 +1,7 @@ package com.android.puy.puymvpjava.net; -import cn.droidlover.xdroidmvp.kit.Kits; -import cn.droidlover.xdroidmvp.net.progress.ProgressHelper; +import com.android.puy.puymvpjava.kit.Kits; +import com.android.puy.puymvpjava.net.progress.ProgressHelper; import io.reactivex.Flowable; import io.reactivex.FlowableTransformer; import io.reactivex.android.schedulers.AndroidSchedulers; diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/net/cookie/PersistentCookieStore.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/net/cookie/PersistentCookieStore.java index 75a6935..0202808 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/net/cookie/PersistentCookieStore.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/net/cookie/PersistentCookieStore.java @@ -3,7 +3,7 @@ import android.content.Context; import android.content.SharedPreferences; import android.text.TextUtils; -import cn.droidlover.xdroidmvp.log.XLog; +import com.android.puy.puymvpjava.log.XLog; import okhttp3.Cookie; import okhttp3.HttpUrl; diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/net/progress/ProgressHelper.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/net/progress/ProgressHelper.java index ba8496b..bab6c48 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/net/progress/ProgressHelper.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/net/progress/ProgressHelper.java @@ -2,7 +2,7 @@ import android.os.Handler; import android.os.Looper; -import cn.droidlover.xdroidmvp.kit.Kits; +import com.android.puy.puymvpjava.kit.Kits; import okhttp3.Interceptor; import okhttp3.Request; import okhttp3.Response; diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/router/Router.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/router/Router.java index 45815e4..952f5b8 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/router/Router.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/router/Router.java @@ -7,7 +7,7 @@ import android.support.annotation.Nullable; import android.support.v4.app.ActivityCompat; import android.support.v4.app.ActivityOptionsCompat; -import cn.droidlover.xdroidmvp.XDroidConf; +import com.android.puy.puymvpjava.XDroidConf; import java.io.Serializable; import java.util.ArrayList; diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/threadpool/ThreadPoolHelp.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/threadpool/ThreadPoolHelp.java index 30cfaae..4d98d83 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/threadpool/ThreadPoolHelp.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/threadpool/ThreadPoolHelp.java @@ -9,7 +9,7 @@ */ package com.android.puy.puymvpjava.threadpool; -import cn.droidlover.xdroidmvp.threadpool.builder.*; +import com.android.puy.puymvpjava.threadpool.builder.*; import java.util.concurrent.*; diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/threadpool/builder/CachedBuilder.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/threadpool/builder/CachedBuilder.java index 5f59ab1..57d1e87 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/threadpool/builder/CachedBuilder.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/threadpool/builder/CachedBuilder.java @@ -9,7 +9,7 @@ */ package com.android.puy.puymvpjava.threadpool.builder; -import cn.droidlover.xdroidmvp.threadpool.ThreadPoolType; +import com.android.puy.puymvpjava.threadpool.ThreadPoolType; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/threadpool/builder/CustomBuilder.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/threadpool/builder/CustomBuilder.java index 8879ac1..723494f 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/threadpool/builder/CustomBuilder.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/threadpool/builder/CustomBuilder.java @@ -9,7 +9,7 @@ */ package com.android.puy.puymvpjava.threadpool.builder; -import cn.droidlover.xdroidmvp.threadpool.ThreadPoolType; +import com.android.puy.puymvpjava.threadpool.ThreadPoolType; import java.util.concurrent.*; diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/threadpool/builder/FixedBuilder.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/threadpool/builder/FixedBuilder.java index 37157e9..725ddd8 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/threadpool/builder/FixedBuilder.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/threadpool/builder/FixedBuilder.java @@ -9,7 +9,7 @@ */ package com.android.puy.puymvpjava.threadpool.builder; -import cn.droidlover.xdroidmvp.threadpool.ThreadPoolType; +import com.android.puy.puymvpjava.threadpool.ThreadPoolType; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/threadpool/builder/ScheduledBuilder.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/threadpool/builder/ScheduledBuilder.java index 3a7c208..bf50cdd 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/threadpool/builder/ScheduledBuilder.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/threadpool/builder/ScheduledBuilder.java @@ -9,7 +9,7 @@ */ package com.android.puy.puymvpjava.threadpool.builder; -import cn.droidlover.xdroidmvp.threadpool.ThreadPoolType; +import com.android.puy.puymvpjava.threadpool.ThreadPoolType; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/threadpool/builder/SingleBuilder.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/threadpool/builder/SingleBuilder.java index c58d8f1..5a15608 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/threadpool/builder/SingleBuilder.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/threadpool/builder/SingleBuilder.java @@ -9,7 +9,7 @@ */ package com.android.puy.puymvpjava.threadpool.builder; -import cn.droidlover.xdroidmvp.threadpool.ThreadPoolType; +import com.android.puy.puymvpjava.threadpool.ThreadPoolType; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/puymvpjava/src/main/java/com/android/puy/puymvpjava/threadpool/builder/ThreadPoolBuilder.java b/puymvpjava/src/main/java/com/android/puy/puymvpjava/threadpool/builder/ThreadPoolBuilder.java index 367fb12..c196b14 100644 --- a/puymvpjava/src/main/java/com/android/puy/puymvpjava/threadpool/builder/ThreadPoolBuilder.java +++ b/puymvpjava/src/main/java/com/android/puy/puymvpjava/threadpool/builder/ThreadPoolBuilder.java @@ -9,7 +9,7 @@ */ package com.android.puy.puymvpjava.threadpool.builder; -import cn.droidlover.xdroidmvp.threadpool.ThreadPoolType; +import com.android.puy.puymvpjava.threadpool.ThreadPoolType; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/puymvpjava/src/main/res/layout/swipeback_layout.xml b/puymvpjava/src/main/res/layout/swipeback_layout.xml new file mode 100644 index 0000000..2d3ba55 --- /dev/null +++ b/puymvpjava/src/main/res/layout/swipeback_layout.xml @@ -0,0 +1,5 @@ + + \ No newline at end of file diff --git a/puymvpjava/src/main/res/values/attrs.xml b/puymvpjava/src/main/res/values/attrs.xml new file mode 100644 index 0000000..634c746 --- /dev/null +++ b/puymvpjava/src/main/res/values/attrs.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/puymvpjava/src/main/res/values/colors.xml b/puymvpjava/src/main/res/values/colors.xml new file mode 100644 index 0000000..4af3192 --- /dev/null +++ b/puymvpjava/src/main/res/values/colors.xml @@ -0,0 +1,5 @@ + + + #00000000 + #cc222222 + \ No newline at end of file diff --git a/puymvpjava/src/main/res/values/strings.xml b/puymvpjava/src/main/res/values/strings.xml index fbdd1ab..a9fa1c4 100644 --- a/puymvpjava/src/main/res/values/strings.xml +++ b/puymvpjava/src/main/res/values/strings.xml @@ -1,3 +1,3 @@ - Puymvp_java + Mvp