Skip to content

Commit

Permalink
修复问题
Browse files Browse the repository at this point in the history
  • Loading branch information
puyang1017 committed Jan 29, 2019
1 parent 7ba9602 commit 809f191
Show file tree
Hide file tree
Showing 74 changed files with 243 additions and 169 deletions.
5 changes: 3 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
}
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<T extends Animator> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<ValueAnimator> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<AnimatorSet> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<ValueAnimator> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<ValueAnimator> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<AnimatorSet> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Loading

0 comments on commit 809f191

Please sign in to comment.