From 7ce64ddc6393c65b98950c5fb438cdf9d93afc58 Mon Sep 17 00:00:00 2001 From: wanglei Date: Mon, 12 Dec 2016 14:15:02 +0800 Subject: [PATCH] fix demo --- Readme.md | 16 +++- app/app.iml | 54 +++++--------- app/src/main/AndroidManifest.xml | 6 +- .../xdroid/demo/adapter/HomeAdapter.java | 8 +- .../xdroid/demo/model/GankResults.java | 16 ++-- .../xdroid/demo/ui/BasePagerFragment.java | 5 +- .../xdroid/demo/ui/GirlFragment.java | 2 +- .../xdroid/demo/ui/MainActivity.java | 6 +- .../xdroid/demo/ui/WebActivity.java | 11 ++- app/src/main/res/layout/activity_about.xml | 69 +++++++++++++++++- app/src/main/res/layout/adapter_girl.xml | 7 +- .../main/res/mipmap-xhdpi/xdroid_logo_128.png | Bin 0 -> 22496 bytes library/library.iml | 24 +++--- .../cn/droidlover/xdroid/base/XActivity.java | 3 +- .../cn/droidlover/xdroid/base/XFragment.java | 3 +- 15 files changed, 143 insertions(+), 87 deletions(-) create mode 100644 app/src/main/res/mipmap-xhdpi/xdroid_logo_128.png diff --git a/Readme.md b/Readme.md index 7351ada..0bb7186 100644 --- a/Readme.md +++ b/Readme.md @@ -10,6 +10,7 @@ > Demo详细使用可参看Demo + ## 特性 **XDroid**主要有这些特性: @@ -50,12 +51,22 @@ git clone https://github.com/limedroid/XDroid.git compile project(':library') ``` - ### step3 修改`XDroidConf`配置类,主要针对log、cache、router、imageloader。若采用默认配置,此步骤可略过. +## Demo效果 + +

+ +

+ +

+ +

+ + ## 重要说明 * [ButterKnife](https://github.com/JakeWharton/butterknife)使用的是8.4.0版本,重点是 `@BindView`,可以去项目官网查看。 @@ -70,8 +81,9 @@ compile project(':library') ## 感谢 -* 感谢各位江湖前辈大拿的帮助 * 特别感谢基友石浩提供的建议和完美logo +* 感谢干货提供的api + ## 关于我 diff --git a/app/app.iml b/app/app.iml index 7feaa82..2865871 100644 --- a/app/app.iml +++ b/app/app.iml @@ -65,14 +65,6 @@ - - - - - - - - @@ -81,53 +73,47 @@ + + + + + + + + + - - - - - - - - - - - + + + + + + + + - - - + + - - - - - - - - - - - - + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 50214a6..13d8511 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -8,12 +8,14 @@ - + diff --git a/app/src/main/java/cn/droidlover/xdroid/demo/adapter/HomeAdapter.java b/app/src/main/java/cn/droidlover/xdroid/demo/adapter/HomeAdapter.java index 215d45d..1308b97 100644 --- a/app/src/main/java/cn/droidlover/xdroid/demo/adapter/HomeAdapter.java +++ b/app/src/main/java/cn/droidlover/xdroid/demo/adapter/HomeAdapter.java @@ -14,7 +14,6 @@ import cn.droidlover.xdroid.demo.R; import cn.droidlover.xdroid.demo.model.GankResults; import cn.droidlover.xdroid.imageloader.ILFactory; -import cn.droidlover.xdroid.kit.Kits; import cn.droidlover.xdroid.kit.KnifeKit; /** @@ -114,11 +113,8 @@ public void onClick(View v) { holder.tvAuthor.setText(""); } - if (item.getCreatedAt() > 0) { - holder.tvTime.setText(Kits.Date.getMd(item.getCreatedAt())); - } else { - holder.tvTime.setText(""); - } + holder.tvTime.setText(item.getCreatedAt()); + holder.tvType.setText(type); holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/cn/droidlover/xdroid/demo/model/GankResults.java b/app/src/main/java/cn/droidlover/xdroid/demo/model/GankResults.java index 48bea25..cb08a39 100644 --- a/app/src/main/java/cn/droidlover/xdroid/demo/model/GankResults.java +++ b/app/src/main/java/cn/droidlover/xdroid/demo/model/GankResults.java @@ -8,20 +8,20 @@ public class GankResults extends BaseModel { - private List items; + private List results; - public List getItems() { - return items; + public List getResults() { + return results; } - public void setItems(List items) { - this.items = items; + public void setResults(List results) { + this.results = results; } public static class Item { private String _id; private String _ns; - private long createdAt; + private String createdAt; private String desc; private String publishedAt; private String source; @@ -46,11 +46,11 @@ public void set_ns(String _ns) { this._ns = _ns; } - public long getCreatedAt() { + public String getCreatedAt() { return createdAt; } - public void setCreatedAt(long createdAt) { + public void setCreatedAt(String createdAt) { this.createdAt = createdAt; } diff --git a/app/src/main/java/cn/droidlover/xdroid/demo/ui/BasePagerFragment.java b/app/src/main/java/cn/droidlover/xdroid/demo/ui/BasePagerFragment.java index 257f224..cc03b80 100644 --- a/app/src/main/java/cn/droidlover/xdroid/demo/ui/BasePagerFragment.java +++ b/app/src/main/java/cn/droidlover/xdroid/demo/ui/BasePagerFragment.java @@ -20,7 +20,6 @@ public abstract class BasePagerFragment extends XFragment { - @BindView(R.id.contentLayout) XRecyclerContentLayout contentLayout; @@ -71,9 +70,9 @@ public void onFail(Call call, Exception e, int id) { public void onResponse(GankResults response, int id) { if (!response.isError()) { if (page > 1) { - getAdapter().addData(response.getItems()); + getAdapter().addData(response.getResults()); } else { - getAdapter().setData(response.getItems()); + getAdapter().setData(response.getResults()); } contentLayout.getRecyclerView().setPage(page, MAX_PAGE); diff --git a/app/src/main/java/cn/droidlover/xdroid/demo/ui/GirlFragment.java b/app/src/main/java/cn/droidlover/xdroid/demo/ui/GirlFragment.java index 1f79c82..a2ec6c8 100644 --- a/app/src/main/java/cn/droidlover/xdroid/demo/ui/GirlFragment.java +++ b/app/src/main/java/cn/droidlover/xdroid/demo/ui/GirlFragment.java @@ -30,7 +30,7 @@ public void onItemClick(int position, GankResults.Item model, int tag, GirlAdapt @Override public void setLayoutManager(XRecyclerView recyclerView) { - recyclerView.verticalStaggeredLayoutManager(2); + recyclerView.gridLayoutManager(context, 2); } @Override diff --git a/app/src/main/java/cn/droidlover/xdroid/demo/ui/MainActivity.java b/app/src/main/java/cn/droidlover/xdroid/demo/ui/MainActivity.java index e04dc58..f65a255 100644 --- a/app/src/main/java/cn/droidlover/xdroid/demo/ui/MainActivity.java +++ b/app/src/main/java/cn/droidlover/xdroid/demo/ui/MainActivity.java @@ -1,8 +1,6 @@ package cn.droidlover.xdroid.demo.ui; import android.os.Bundle; -import android.support.design.widget.AppBarLayout; -import android.support.design.widget.CoordinatorLayout; import android.support.design.widget.TabLayout; import android.support.v4.app.Fragment; import android.support.v4.view.ViewPager; @@ -10,13 +8,10 @@ import android.view.Menu; import android.view.MenuItem; -import com.bumptech.glide.GifRequestBuilder; - import java.util.ArrayList; import java.util.List; import butterknife.BindView; -import butterknife.ButterKnife; import cn.droidlover.xdroid.base.XActivity; import cn.droidlover.xdroid.base.XFragmentAdapter; import cn.droidlover.xdroid.demo.R; @@ -80,6 +75,7 @@ public boolean onOptionsItemSelected(MenuItem item) { return super.onOptionsItemSelected(item); } + @Override public int getLayoutId() { return R.layout.activity_main; diff --git a/app/src/main/java/cn/droidlover/xdroid/demo/ui/WebActivity.java b/app/src/main/java/cn/droidlover/xdroid/demo/ui/WebActivity.java index cffd5a4..8096620 100644 --- a/app/src/main/java/cn/droidlover/xdroid/demo/ui/WebActivity.java +++ b/app/src/main/java/cn/droidlover/xdroid/demo/ui/WebActivity.java @@ -86,10 +86,13 @@ private void initWebView() { public void onProgressChanged(WebView view, int newProgress) { super.onProgressChanged(view, newProgress); if (newProgress == 100) { - contentLayout.showContent(); - url = webView.getUrl(); + if (contentLayout != null) + contentLayout.showContent(); + if (webView != null) + url = webView.getUrl(); } else { - contentLayout.showLoading(); + if (contentLayout != null) + contentLayout.showLoading(); } } }); @@ -124,7 +127,7 @@ public boolean onOptionsItemSelected(MenuItem item) { finish(); break; case R.id.action_share: - AppKit.shareText(this, webView.getTitle() + " " + webView.getUrl() + " 来自「趣刻」APP"); + AppKit.shareText(this, webView.getTitle() + " " + webView.getUrl() + " 来自「XDroid」"); break; case R.id.action_refresh: webView.reload(); diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index 0ab4fc0..7c4487c 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -1,9 +1,74 @@ + android:layout_height="match_parent" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/adapter_girl.xml b/app/src/main/res/layout/adapter_girl.xml index 5791726..97d473d 100644 --- a/app/src/main/res/layout/adapter_girl.xml +++ b/app/src/main/res/layout/adapter_girl.xml @@ -2,18 +2,17 @@ + android:scaleType="fitXY" /> \ No newline at end of file diff --git a/app/src/main/res/mipmap-xhdpi/xdroid_logo_128.png b/app/src/main/res/mipmap-xhdpi/xdroid_logo_128.png new file mode 100644 index 0000000000000000000000000000000000000000..ebec01646f4539afdf80fdf145fc8a284cc8c532 GIT binary patch literal 22496 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�wDt5=-haVEHw5-+-`A$i&U2S97hZ|pf%RH;m-p7|g~$yy{k~5C z^iW@3-LLiIw{rN(WiZ*JU+Z%Mmy2flYUk+@hp&>(<$@Zz5XpU4-uI>37QW?UU+z5} zFDK&IaU~JO(yQ+4f4?ZdN~nArczjv3`>vYRPrGW2-+HCTzx@03_7$pM04BA$EtlV; zf2qqje$WoccGX7=6?5gf>gO5~3_AUB?@$5sp?9re7YI5$Y%f^D+Vk5q-rm)-f zhu}miX=KoRlvL3o(oCJAPxMf0+#vddLv(OlAWR}%jS`B8R#v&gm2i=wxW-QitFVdZ z#}X}@0`1m=7mryso7P2~A9>E$YdByE8lGm%G2|Mb9sVa^44mKB|M2OTzd{UWAf$>s zfKcBo{87CFcI!9v(^o;FGkhW5Rf4tmN+SCX3;6_t4Oe;SeOHaqb%B$ouDY-P9_dS! vH+I$E8FrP2kN1W8K9BDsz8*QP{Qm<0qv&ucIq<}P00000NkvXXu0mjfWr!RB literal 0 HcmV?d00001 diff --git a/library/library.iml b/library/library.iml index 2aff423..c868869 100644 --- a/library/library.iml +++ b/library/library.iml @@ -101,22 +101,22 @@ + + + + + + - - - - + + + - - - - + - - - - + + \ No newline at end of file diff --git a/library/src/main/java/cn/droidlover/xdroid/base/XActivity.java b/library/src/main/java/cn/droidlover/xdroid/base/XActivity.java index 20722ba..ee5c9ec 100644 --- a/library/src/main/java/cn/droidlover/xdroid/base/XActivity.java +++ b/library/src/main/java/cn/droidlover/xdroid/base/XActivity.java @@ -69,13 +69,12 @@ protected void onStop() { @Override public boolean useEventBus() { - return true; + return false; } @Override protected void onDestroy() { super.onDestroy(); - KnifeKit.unbind(unbinder); getUiDelegate().destory(); } } diff --git a/library/src/main/java/cn/droidlover/xdroid/base/XFragment.java b/library/src/main/java/cn/droidlover/xdroid/base/XFragment.java index ad65f66..029378f 100644 --- a/library/src/main/java/cn/droidlover/xdroid/base/XFragment.java +++ b/library/src/main/java/cn/droidlover/xdroid/base/XFragment.java @@ -68,13 +68,12 @@ public void onDetach() { @Override public boolean useEventBus() { - return true; + return false; } @Override public void onDestroyView() { super.onDestroyView(); - KnifeKit.unbind(unbinder); BusFactory.getBus().unregister(this); getUiDelegate().destory(); }