diff --git a/.gitignore b/.gitignore index c6cbe56..91e5885 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ .DS_Store /build /captures +.idea/ diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 6cba274..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -PrettyGirls \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 96cc43e..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index f06bb27..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 20a3f2d..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index c60d22d..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1.7 - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index cfca172..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index d1c6722..09fd1a2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,4 +1,6 @@ apply plugin: 'com.android.application' +// retrolambda +apply plugin: 'me.tatarka.retrolambda' android { compileSdkVersion 23 @@ -17,32 +19,30 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } } apply plugin: 'com.neenbedankt.android-apt' dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) + compile fileTree(include: ['*.jar'], dir: 'libs') testCompile 'junit:junit:4.12' compile 'com.android.support:appcompat-v7:23.4.0' compile 'com.android.support:design:23.4.0' compile 'com.android.support:palette-v7:23.4.0' compile 'com.android.support:cardview-v7:23.+' - compile 'com.jakewharton:butterknife:8.1.0' apt 'com.jakewharton:butterknife-compiler:8.1.0' - compile 'com.jude:easyrecyclerview:4.0.2' - /*compile 'com.github.bumptech.glide:glide:3.7.0'*/ compile 'jp.wasabeef:glide-transformations:2.0.1' - compile 'com.squareup.okhttp3:okhttp:3.3.1' compile 'com.squareup.retrofit2:retrofit:2.0.2' compile 'com.squareup.retrofit2:converter-gson:2.0.2' compile 'com.squareup.retrofit2:adapter-rxjava:2.0.2' - compile 'io.reactivex:rxandroid:1.2.1' compile 'io.reactivex:rxjava:1.1.6' - compile project(':mylibrary') } diff --git a/app/src/main/java/coder/prettygirls/BaseView.java b/app/src/main/java/coder/prettygirls/BaseView.java index ca2e6d9..b594ac2 100644 --- a/app/src/main/java/coder/prettygirls/BaseView.java +++ b/app/src/main/java/coder/prettygirls/BaseView.java @@ -18,5 +18,6 @@ public interface BaseView { + void setPresenter(T presenter); } diff --git a/app/src/main/java/coder/prettygirls/about/AboutActivity.java b/app/src/main/java/coder/prettygirls/about/AboutActivity.java index 9dc34b3..26f940c 100644 --- a/app/src/main/java/coder/prettygirls/about/AboutActivity.java +++ b/app/src/main/java/coder/prettygirls/about/AboutActivity.java @@ -59,12 +59,7 @@ private void initView() { mAboutToolbar.setTitle("关于我"); setSupportActionBar(mAboutToolbar); mAboutToolbar.setNavigationIcon(R.drawable.ic_back); - mAboutToolbar.setNavigationOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finishActivity(); - } - }); + mAboutToolbar.setNavigationOnClickListener(v -> finishActivity()); //毛玻璃效果 Glide.with(this) diff --git a/app/src/main/java/coder/prettygirls/data/source/GirlsResponsitory.java b/app/src/main/java/coder/prettygirls/data/source/GirlsRepository.java similarity index 88% rename from app/src/main/java/coder/prettygirls/data/source/GirlsResponsitory.java rename to app/src/main/java/coder/prettygirls/data/source/GirlsRepository.java index e7509f1..8ed38e0 100644 --- a/app/src/main/java/coder/prettygirls/data/source/GirlsResponsitory.java +++ b/app/src/main/java/coder/prettygirls/data/source/GirlsRepository.java @@ -6,12 +6,12 @@ /** * Created by oracleen on 2016/6/29. */ -public class GirlsResponsitory implements GirlsDataSource { +public class GirlsRepository implements GirlsDataSource { private LocalGirlsDataSource mLocalGirlsDataSource; private RemoteGirlsDataSource mRemoteGirlsDataSource; - public GirlsResponsitory() { + public GirlsRepository() { mLocalGirlsDataSource = new LocalGirlsDataSource(); mRemoteGirlsDataSource = new RemoteGirlsDataSource(); } diff --git a/app/src/main/java/coder/prettygirls/data/source/remote/RemoteGirlsDataSource.java b/app/src/main/java/coder/prettygirls/data/source/remote/RemoteGirlsDataSource.java index 64dce94..dc4e455 100644 --- a/app/src/main/java/coder/prettygirls/data/source/remote/RemoteGirlsDataSource.java +++ b/app/src/main/java/coder/prettygirls/data/source/remote/RemoteGirlsDataSource.java @@ -1,10 +1,8 @@ package coder.prettygirls.data.source.remote; -import coder.prettygirls.data.bean.GirlsBean; import coder.prettygirls.data.source.GirlsDataSource; -import coder.prettygirls.http.GirlsRetrofit; +import coder.prettygirls.http.RetrofitUtil; import coder.prettygirls.http.GirlsService; -import rx.Observer; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; @@ -15,27 +13,15 @@ public class RemoteGirlsDataSource implements GirlsDataSource { @Override public void getGirls(int page, int size, final LoadGirlsCallback callback) { - GirlsRetrofit.getRetrofit() + RetrofitUtil.getInstance() .create(GirlsService.class) .getGirls("福利", size, page) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - callback.onDataNotAvailable(); - } - - @Override - public void onNext(GirlsBean girlsBean) { - callback.onGirlsLoaded(girlsBean); - } - }); + .subscribe( + callback::onGirlsLoaded, + throwable -> callback.onDataNotAvailable() + ); } @Override diff --git a/app/src/main/java/coder/prettygirls/girl/GirlActivity.java b/app/src/main/java/coder/prettygirls/girl/GirlActivity.java index 7311184..a4136a5 100644 --- a/app/src/main/java/coder/prettygirls/girl/GirlActivity.java +++ b/app/src/main/java/coder/prettygirls/girl/GirlActivity.java @@ -53,12 +53,7 @@ private void initView() { mToolbar.setTitle(R.string.meizhi); setSupportActionBar(mToolbar); mToolbar.setNavigationIcon(R.drawable.ic_back); - mToolbar.setNavigationOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finishActivity(); - } - }); + mToolbar.setNavigationOnClickListener(v -> finishActivity()); } @Override diff --git a/app/src/main/java/coder/prettygirls/girl/GirlFragment.java b/app/src/main/java/coder/prettygirls/girl/GirlFragment.java index af16432..62c986f 100644 --- a/app/src/main/java/coder/prettygirls/girl/GirlFragment.java +++ b/app/src/main/java/coder/prettygirls/girl/GirlFragment.java @@ -29,7 +29,6 @@ import coder.prettygirls.widget.PinchImageView; import rx.Observable; import rx.android.schedulers.AndroidSchedulers; -import rx.functions.Action1; import rx.schedulers.Schedulers; /** @@ -126,15 +125,12 @@ private void getColor() { PinchImageView imageView = getCurrentImageView(); Bitmap bitmap = BitmapUtil.drawableToBitmap(imageView.getDrawable()); Palette.Builder builder = Palette.from(bitmap); - builder.generate(new Palette.PaletteAsyncListener() { - @Override - public void onGenerated(Palette palette) { + builder.generate(palette -> { // Palette.Swatch vir = palette.getLightMutedSwatch(); - Palette.Swatch vir = palette.getVibrantSwatch(); - if (vir == null) - return; - mListener.change(vir.getRgb()); - } + Palette.Swatch vir = palette.getVibrantSwatch(); + if (vir == null) + return; + mListener.change(vir.getRgb()); }); } @@ -146,14 +142,11 @@ public void saveGirl() { Observable.just(BitmapUtil.saveBitmap(bitmap, Constants.dir, imgUrl.substring(imgUrl.lastIndexOf("/") + 1, imgUrl.length()), true)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Action1() { - @Override - public void call(Boolean isSuccess) { - if (isSuccess) { - Snackbar.make(mRootView, "大爷，下载好了呢~", Snackbar.LENGTH_LONG).show(); - } else { - Snackbar.make(mRootView, "大爷，下载出错了哦~", Snackbar.LENGTH_LONG).show(); - } + .subscribe(isSuccess -> { + if (isSuccess) { + Snackbar.make(mRootView, "大爷，下载好了呢~", Snackbar.LENGTH_LONG).show(); + } else { + Snackbar.make(mRootView, "大爷，下载出错了哦~", Snackbar.LENGTH_LONG).show(); } }); @@ -174,20 +167,17 @@ public void shareGirl() { Observable.just(BitmapUtil.saveBitmap(bitmap, Constants.dir, "share.jpg", false)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Action1() { - @Override - public void call(Boolean isSuccess) { - if (isSuccess) { - //由文件得到uri - Uri imageUri = Uri.fromFile(new File(Constants.dir + "/share.jpg")); - Intent shareIntent = new Intent(); - shareIntent.setAction(Intent.ACTION_SEND); - shareIntent.putExtra(Intent.EXTRA_STREAM, imageUri); - shareIntent.setType("image/*"); - startActivity(Intent.createChooser(shareIntent, "分享MeiZhi到")); - } else { - Snackbar.make(mRootView, "大爷，分享出错了哦~", Snackbar.LENGTH_LONG).show(); - } + .subscribe(isSuccess -> { + if (isSuccess) { + //由文件得到uri + Uri imageUri = Uri.fromFile(new File(Constants.dir + "/share.jpg")); + Intent shareIntent = new Intent(); + shareIntent.setAction(Intent.ACTION_SEND); + shareIntent.putExtra(Intent.EXTRA_STREAM, imageUri); + shareIntent.setType("image/*"); + startActivity(Intent.createChooser(shareIntent, "分享MeiZhi到")); + } else { + Snackbar.make(mRootView, "大爷，分享出错了哦~", Snackbar.LENGTH_LONG).show(); } }); diff --git a/app/src/main/java/coder/prettygirls/home/GirlsAdapter.java b/app/src/main/java/coder/prettygirls/home/GirlsAdapter.java index 030e359..68ca00b 100644 --- a/app/src/main/java/coder/prettygirls/home/GirlsAdapter.java +++ b/app/src/main/java/coder/prettygirls/home/GirlsAdapter.java @@ -1,7 +1,6 @@ package coder.prettygirls.home; import android.content.Context; -import android.view.View; import android.view.ViewGroup; import com.jude.easyrecyclerview.adapter.BaseViewHolder; @@ -28,12 +27,9 @@ public BaseViewHolder OnCreateViewHolder(ViewGroup parent, int viewType) { @Override public void OnBindViewHolder(final BaseViewHolder holder, final int position) { super.OnBindViewHolder(holder, position); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (mOnItemClickListener != null) { - mOnItemClickListener.onItemClick(position, holder); - } + holder.itemView.setOnClickListener(v -> { + if (mOnItemClickListener != null) { + mOnItemClickListener.onItemClick(position, holder); } }); } diff --git a/app/src/main/java/coder/prettygirls/home/GirlsContract.java b/app/src/main/java/coder/prettygirls/home/GirlsContract.java index bb07cd5..b701cba 100644 --- a/app/src/main/java/coder/prettygirls/home/GirlsContract.java +++ b/app/src/main/java/coder/prettygirls/home/GirlsContract.java @@ -11,7 +11,7 @@ */ public interface GirlsContract { - interface View extends BaseView { + interface View extends BaseView { void refresh(List datas); void load(List datas); diff --git a/app/src/main/java/coder/prettygirls/home/GirlsFragment.java b/app/src/main/java/coder/prettygirls/home/GirlsFragment.java index 4777573..7a810e3 100644 --- a/app/src/main/java/coder/prettygirls/home/GirlsFragment.java +++ b/app/src/main/java/coder/prettygirls/home/GirlsFragment.java @@ -9,7 +9,6 @@ import android.view.ViewStub; import com.jude.easyrecyclerview.EasyRecyclerView; -import com.jude.easyrecyclerview.adapter.BaseViewHolder; import com.jude.easyrecyclerview.adapter.RecyclerArrayAdapter; import java.util.ArrayList; @@ -41,7 +40,7 @@ public class GirlsFragment extends BaseFragment implements GirlsContract.View, S private ArrayList data; private GirlsAdapter mAdapter; - private GirlsPresenter mPresenter; + private GirlsContract.Presenter mPresenter; private int page = 1; private int size = 20; @@ -52,7 +51,7 @@ protected int getLayoutId() { return R.layout.fragment_home; } - public static GirlsFragment getInstance() { + public static GirlsFragment newInstance() { GirlsFragment mainFragment = new GirlsFragment(); return mainFragment; } @@ -61,8 +60,6 @@ public static GirlsFragment getInstance() { protected void initView(View view, Bundle savedInstanceState) { unbinder = ButterKnife.bind(this, view); - mPresenter = new GirlsPresenter(this); - initRecyclerView(); //初始化数据 @@ -90,15 +87,12 @@ private void initRecyclerView() { // } // }); - mAdapter.setOnMyItemClickListener(new GirlsAdapter.OnMyItemClickListener() { - @Override - public void onItemClick(int position, BaseViewHolder holder) { - Intent intent = new Intent(mActivity, GirlActivity.class); - intent.putParcelableArrayListExtra("girls", data); - intent.putExtra("current", position); - ActivityOptionsCompat options = ActivityOptionsCompat.makeScaleUpAnimation(holder.itemView, holder.itemView.getWidth() / 2, holder.itemView.getHeight() / 2, 0, 0); - startActivity(intent, options.toBundle()); - } + mAdapter.setOnMyItemClickListener((position, holder) -> { + Intent intent = new Intent(mActivity, GirlActivity.class); + intent.putParcelableArrayListExtra("girls", data); + intent.putExtra("current", position); + ActivityOptionsCompat options = ActivityOptionsCompat.makeScaleUpAnimation(holder.itemView, holder.itemView.getWidth() / 2, holder.itemView.getHeight() / 2, 0, 0); + startActivity(intent, options.toBundle()); }); mGirlsRecyclerView.setRefreshListener(this); @@ -156,4 +150,9 @@ public void onDestroyView() { super.onDestroyView(); unbinder.unbind(); } + + @Override + public void setPresenter(GirlsContract.Presenter presenter) { + mPresenter = presenter; + } } diff --git a/app/src/main/java/coder/prettygirls/home/GirlsPresenter.java b/app/src/main/java/coder/prettygirls/home/GirlsPresenter.java index d508ed9..b9c8d92 100644 --- a/app/src/main/java/coder/prettygirls/home/GirlsPresenter.java +++ b/app/src/main/java/coder/prettygirls/home/GirlsPresenter.java @@ -4,7 +4,7 @@ import coder.prettygirls.data.bean.GirlsBean; import coder.prettygirls.data.source.GirlsDataSource; -import coder.prettygirls.data.source.GirlsResponsitory; +import coder.prettygirls.data.source.GirlsRepository; /** * Created by oracleen on 2016/6/29. @@ -14,11 +14,12 @@ public class GirlsPresenter implements GirlsContract.Presenter { public static final String TAG = "GirlsPresenter"; private GirlsContract.View mView; - private GirlsResponsitory mGirlsResponsitory; + private GirlsRepository mGirlsRepository; - public GirlsPresenter(GirlsContract.View view) { + public GirlsPresenter(GirlsRepository girlsRepository, GirlsContract.View view) { mView = view; - mGirlsResponsitory = new GirlsResponsitory(); + mGirlsRepository = girlsRepository; + mView.setPresenter(this); } @Override @@ -29,7 +30,7 @@ public void start() { @Override public void getGirls(int page, int size, final boolean isRefresh) { Log.d(TAG, "getGirls"); - mGirlsResponsitory.getGirls(page, size, new GirlsDataSource.LoadGirlsCallback() { + mGirlsRepository.getGirls(page, size, new GirlsDataSource.LoadGirlsCallback() { @Override public void onGirlsLoaded(GirlsBean girlsBean) { if (isRefresh) { diff --git a/app/src/main/java/coder/prettygirls/home/HomeActivity.java b/app/src/main/java/coder/prettygirls/home/HomeActivity.java index b850b66..8349791 100644 --- a/app/src/main/java/coder/prettygirls/home/HomeActivity.java +++ b/app/src/main/java/coder/prettygirls/home/HomeActivity.java @@ -10,7 +10,6 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; -import android.widget.Toast; import butterknife.BindView; import butterknife.ButterKnife; @@ -19,6 +18,7 @@ import coder.mylibrary.base.BaseFragment; import coder.prettygirls.R; import coder.prettygirls.about.AboutActivity; +import coder.prettygirls.data.source.GirlsRepository; public class HomeActivity extends AppActivity { @@ -29,6 +29,8 @@ public class HomeActivity extends AppActivity { private long exitTime = 0; + private GirlsPresenter mPresenter; + @Override protected int getContentViewId() { return R.layout.activity_home; @@ -85,7 +87,13 @@ public boolean onOptionsItemSelected(MenuItem item) { @Override protected BaseFragment getFirstFragment() { - return GirlsFragment.getInstance(); + GirlsFragment girlsFragment = GirlsFragment.newInstance(); + initPresenter(new GirlsRepository(), girlsFragment); + return girlsFragment; + } + + private void initPresenter(GirlsRepository repository, GirlsContract.View view) { + mPresenter = new GirlsPresenter(repository, view); } @Override diff --git a/app/src/main/java/coder/prettygirls/http/GirlsRetrofit.java b/app/src/main/java/coder/prettygirls/http/RetrofitUtil.java similarity index 66% rename from app/src/main/java/coder/prettygirls/http/GirlsRetrofit.java rename to app/src/main/java/coder/prettygirls/http/RetrofitUtil.java index 540ea5b..d6b70cd 100644 --- a/app/src/main/java/coder/prettygirls/http/GirlsRetrofit.java +++ b/app/src/main/java/coder/prettygirls/http/RetrofitUtil.java @@ -9,15 +9,18 @@ /** * Created by gaohailong on 2016/5/17. */ -public class GirlsRetrofit { +public class RetrofitUtil { - private static Retrofit retrofit; + private static volatile Retrofit instance; - public static Retrofit getRetrofit() { - if (retrofit == null) { - synchronized (GirlsRetrofit.class) { - if (retrofit == null) { - retrofit = new Retrofit.Builder() + private RetrofitUtil() { + } + + public static Retrofit getInstance() { + if (instance == null) { + synchronized (RetrofitUtil.class) { + if (instance == null) { + instance = new Retrofit.Builder() .baseUrl(Constants.GANHUO_API) .addConverterFactory(GsonConverterFactory.create()) .addCallAdapterFactory(RxJavaCallAdapterFactory.create()) @@ -26,6 +29,6 @@ public static Retrofit getRetrofit() { } } } - return retrofit; + return instance; } } diff --git a/app/src/main/java/coder/prettygirls/splash/SplashActivity.java b/app/src/main/java/coder/prettygirls/splash/SplashActivity.java index 00300ca..b8b7186 100644 --- a/app/src/main/java/coder/prettygirls/splash/SplashActivity.java +++ b/app/src/main/java/coder/prettygirls/splash/SplashActivity.java @@ -5,12 +5,17 @@ import coder.mylibrary.base.AppActivity; import coder.mylibrary.base.BaseFragment; import coder.prettygirls.R; +import coder.prettygirls.data.source.GirlsRepository; public class SplashActivity extends AppActivity { + private SplashPresenter mSplashPresenter; + @Override protected BaseFragment getFirstFragment() { - return SplashFragment.getInstance(); + SplashFragment mSplashFragment = SplashFragment.newInstance(); + initPresenter(new GirlsRepository(), mSplashFragment); + return mSplashFragment; } @Override @@ -23,6 +28,10 @@ protected int getFragmentContentId() { return R.id.splash_fragment; } + private void initPresenter(GirlsRepository repository, SplashContract.View view) { + mSplashPresenter = new SplashPresenter(repository, view); + } + @Override public void onClick(View v) { diff --git a/app/src/main/java/coder/prettygirls/splash/SplashFragment.java b/app/src/main/java/coder/prettygirls/splash/SplashFragment.java index 5c15c07..4053767 100644 --- a/app/src/main/java/coder/prettygirls/splash/SplashFragment.java +++ b/app/src/main/java/coder/prettygirls/splash/SplashFragment.java @@ -2,9 +2,7 @@ import android.content.Intent; import android.os.Bundle; -import android.view.LayoutInflater; import android.view.View; -import android.view.ViewGroup; import android.view.animation.Animation; import android.view.animation.ScaleAnimation; import android.widget.ImageView; @@ -31,11 +29,10 @@ public class SplashFragment extends BaseFragment implements SplashContract.View private ScaleAnimation scaleAnimation; private Unbinder unbinder; - private SplashPresenter mPresenter; + private SplashContract.Presenter mPresenter; - public static SplashFragment getInstance() { - SplashFragment splashFragment = new SplashFragment(); - return splashFragment; + public static SplashFragment newInstance() { + return new SplashFragment(); } @Override @@ -47,7 +44,7 @@ protected int getLayoutId() { protected void initView(View view, Bundle savedInstanceState) { unbinder = ButterKnife.bind(this, view); - mPresenter = new SplashPresenter(SplashFragment.this); +// mPresenter = new SplashPresenter(SplashFragment.this); initAnim(); } @@ -106,4 +103,9 @@ public void onDestroyView() { super.onDestroyView(); unbinder.unbind(); } + + @Override + public void setPresenter(SplashContract.Presenter presenter) { + this.mPresenter = presenter; + } } diff --git a/app/src/main/java/coder/prettygirls/splash/SplashPresenter.java b/app/src/main/java/coder/prettygirls/splash/SplashPresenter.java index a0e6c1f..2d3d90e 100644 --- a/app/src/main/java/coder/prettygirls/splash/SplashPresenter.java +++ b/app/src/main/java/coder/prettygirls/splash/SplashPresenter.java @@ -3,7 +3,7 @@ import coder.prettygirls.app.MyApplication; import coder.prettygirls.data.bean.GirlsBean; import coder.prettygirls.data.source.GirlsDataSource; -import coder.prettygirls.data.source.GirlsResponsitory; +import coder.prettygirls.data.source.GirlsRepository; /** * Created by oracleen on 2016/6/28. @@ -11,11 +11,13 @@ public class SplashPresenter implements SplashContract.Presenter { private SplashContract.View mView; - private GirlsResponsitory mResponsitory; + private GirlsRepository mResponsitory; - public SplashPresenter(SplashContract.View view) { + public SplashPresenter(GirlsRepository girlsRepository, SplashContract.View view) { mView = view; - mResponsitory = new GirlsResponsitory(); + mResponsitory = girlsRepository; + + mView.setPresenter(this); } @Override @@ -24,8 +26,9 @@ public void start() { @Override public void onGirlsLoaded(GirlsBean girlsBean) { - mView.showGirl(girlsBean.getResults().get(0).getUrl()); - MyApplication.currentGirl = girlsBean.getResults().get(0).getUrl(); + String url = girlsBean.getResults().get(0).getUrl(); + mView.showGirl(url); + MyApplication.currentGirl = url; } @Override diff --git a/build.gradle b/build.gradle index d8a2d5f..d6a1b20 100644 --- a/build.gradle +++ b/build.gradle @@ -5,8 +5,10 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.5.0' + classpath 'com.android.tools.build:gradle:2.1.2' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' + // retrolambda + classpath 'me.tatarka:gradle-retrolambda:3.2.5' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f23df6e..476efaa 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Oct 21 11:34:03 PDT 2015 +#Wed Aug 03 15:40:07 CST 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip