wanandroid的Appdemo加入，正在书写中

yaozs · yaozs · commit c4fecdd90b91 · 2018-05-03T13:46:51.000+08:00
diff --git a/wanandroidapp/src/main/AndroidManifest.xml b/wanandroidapp/src/main/AndroidManifest.xml
@@ -16,13 +16,14 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".ui.activity.MainActivity">
+        <activity android:name=".ui.activity.TestActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name=".ui.activity.MainActivity"/>
     </application>
 
 </manifest>
diff --git a/wanandroidapp/src/main/java/com/yzs/wanandroidapp/bean/BannerBean.java b/wanandroidapp/src/main/java/com/yzs/wanandroidapp/bean/BannerBean.java
@@ -5,7 +5,7 @@
 /**
  * Author: 姚智胜
  * Version: V1.0版本
- * Description:
+ * Description: 首页banner数据类
  * Date: 2018/4/25
  */
 public class BannerBean {
diff --git a/wanandroidapp/src/main/java/com/yzs/wanandroidapp/bean/HomeBean.java b/wanandroidapp/src/main/java/com/yzs/wanandroidapp/bean/HomeBean.java
@@ -5,7 +5,7 @@
 /**
  * Author: 姚智胜
  * Version: V1.0版本
- * Description:
+ * Description: 首页数据类
  * Date: 2018/4/23
  */
 public class HomeBean {
diff --git a/wanandroidapp/src/main/java/com/yzs/wanandroidapp/bean/HomeKnowledgeBean.java b/wanandroidapp/src/main/java/com/yzs/wanandroidapp/bean/HomeKnowledgeBean.java
diff --git a/wanandroidapp/src/main/java/com/yzs/wanandroidapp/contract/HomeContract.java b/wanandroidapp/src/main/java/com/yzs/wanandroidapp/contract/HomeContract.java
@@ -28,11 +28,14 @@ interface CHomeModel extends BaseModel {
         Observable<HomeBean> requestHomeListData(int page);
 
         Observable<BannerBean> requestBannerData();
+
+        Observable<Object> refresh();
     }
 
     abstract static class CHomePresenter extends BasePresenter<CHomeView, CHomeModel> {
+
         public abstract void getDataRequest(int page);
 
-        public abstract void getBannerDataRequest();
+        public abstract void refresh();
     }
 }
diff --git a/wanandroidapp/src/main/java/com/yzs/wanandroidapp/model/HomeModel.java b/wanandroidapp/src/main/java/com/yzs/wanandroidapp/model/HomeModel.java
@@ -1,68 +1,33 @@
 package com.yzs.wanandroidapp.model;
 
-import com.google.gson.Gson;
 import com.yzs.wanandroidapp.bean.BannerBean;
 import com.yzs.wanandroidapp.bean.HomeBean;
 import com.yzs.wanandroidapp.contract.HomeContract;
 import com.yzs.wanandroidapp.http.Api;
-import com.yzs.yzslibrary.util.LogUtils;
 
 import io.reactivex.Observable;
-import io.reactivex.Observer;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.annotations.NonNull;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Function;
-import io.reactivex.schedulers.Schedulers;
 
 /**
  * Author: 姚智胜
  * Version: V1.0版本
- * Description:
+ * Description: 首页model
  * Date: 2018/4/25
  */
 public class HomeModel implements HomeContract.CHomeModel {
 
     @Override
     public Observable<HomeBean> requestHomeListData(int page) {
-        return Api.getDefault().getFeedArticleList(page).map(new Function<HomeBean, HomeBean>() {
-            @Override
-            public HomeBean apply(@NonNull HomeBean homeBean) throws Exception {
-                return homeBean;
-            }
-        });
-//                subscribeOn(Schedulers.io()).
-//                observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer<HomeBean>() {
-//            @Override
-//            public void onSubscribe(@NonNull Disposable disposable) {
-//
-//            }
-//
-//            @Override
-//            public void onNext(@NonNull HomeBean homeBean) {
-//                LogUtils.e(new Gson().toJson(homeBean));
-//            }
-//
-//            @Override
-//            public void onError(@NonNull Throwable throwable) {
-//
-//            }
-//
-//            @Override
-//            public void onComplete() {
-//
-//            }
-//        });
+        return Api.getDefault().getFeedArticleList(page);
     }
 
     @Override
     public Observable<BannerBean> requestBannerData() {
-        return Api.getDefault().getBanner().map(new Function<BannerBean, BannerBean>() {
-            @Override
-            public BannerBean apply(@NonNull BannerBean bannerBean) throws Exception {
-                return bannerBean;
-            }
-        });
+        return Api.getDefault().getBanner();
+    }
+
+    @Override
+    public Observable<Object>  refresh() {
+        return Observable.merge(requestBannerData(), requestHomeListData(0));
     }
 
     @Override
diff --git a/wanandroidapp/src/main/java/com/yzs/wanandroidapp/presenter/HomePresenter.java b/wanandroidapp/src/main/java/com/yzs/wanandroidapp/presenter/HomePresenter.java
@@ -1,12 +1,12 @@
 package com.yzs.wanandroidapp.presenter;
 
+
 import com.yzs.wanandroidapp.bean.BannerBean;
 import com.yzs.wanandroidapp.bean.HomeBean;
 import com.yzs.wanandroidapp.contract.HomeContract;
-import com.yzs.yzslibrary.util.LogUtils;
+
 
 import io.reactivex.Observer;
-import io.reactivex.Scheduler;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.annotations.NonNull;
 import io.reactivex.disposables.Disposable;
@@ -15,13 +15,14 @@
 /**
  * Author: 姚智胜
  * Version: V1.0版本
- * Description:
+ * Description: 首页presenter
  * Date: 2018/4/25
  */
 public class HomePresenter extends HomeContract.CHomePresenter {
 
     @Override
     public void getDataRequest(int page) {
+
         mModel.requestHomeListData(page).subscribeOn(Schedulers.io()).
                 observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer<HomeBean>() {
             @Override
@@ -47,34 +48,32 @@ public void onComplete() {
     }
 
     @Override
-    public void getBannerDataRequest() {
-        mModel.requestBannerData().subscribeOn(Schedulers.io()).
-                observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer<BannerBean>() {
-            @Override
-            public void onSubscribe(@NonNull Disposable disposable) {
-//                mView.showLoading("");
-            }
-
+    public void refresh() {
+        mModel.refresh().subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer<Object>() {
             @Override
-            public void onNext(@NonNull BannerBean bannerBean) {
-                LogUtils.e("onNext");
-                if (bannerBean.getErrorCode() < 0) {
-                    mView.showErrorTip(bannerBean.getErrorMsg());
-                } else {
+            public void onNext(@NonNull Object o) {
+                if (o instanceof BannerBean) {
+                    BannerBean bannerBean = (BannerBean) o;
                     mView.showBanner(bannerBean.getData());
+                } else if (o instanceof HomeBean) {
+                    HomeBean homeBean = (HomeBean) o;
+                    mView.showData(homeBean.getData());
                 }
             }
 
             @Override
             public void onError(@NonNull Throwable throwable) {
                 mView.showErrorTip(throwable.getMessage());
-                LogUtils.e("onError");
             }
 
             @Override
             public void onComplete() {
-                LogUtils.e("onComplete");
-//                mView.stopLoading();
+                mView.stopLoading();
+            }
+
+            @Override
+            public void onSubscribe(@NonNull Disposable disposable) {
+                mView.showLoading("");
             }
         });
     }
diff --git a/wanandroidapp/src/main/java/com/yzs/wanandroidapp/ui/activity/TestActivity.java b/wanandroidapp/src/main/java/com/yzs/wanandroidapp/ui/activity/TestActivity.java
@@ -0,0 +1,30 @@
+package com.yzs.wanandroidapp.ui.activity;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.View;
+
+import com.yzs.wanandroidapp.R;
+
+/**
+ * Author: 姚智胜
+ * Version: V1.0版本
+ * Description:
+ * Date: 2018/4/28
+ */
+public class TestActivity extends Activity {
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.ac_test);
+        findViewById(R.id.btn_test).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                startActivity(new Intent(TestActivity.this, MainActivity.class));
+            }
+        });
+
+    }
+}
diff --git a/wanandroidapp/src/main/java/com/yzs/wanandroidapp/ui/fragment/home/HomeFragment.java b/wanandroidapp/src/main/java/com/yzs/wanandroidapp/ui/fragment/home/HomeFragment.java
@@ -4,8 +4,8 @@
 import android.view.LayoutInflater;
 import android.view.View;
 
+import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.google.gson.Gson;
 import com.like.LikeButton;
 import com.like.OnLikeListener;
 import com.youth.banner.Banner;
@@ -16,28 +16,19 @@
 import com.yzs.wanandroidapp.bean.BannerBean;
 import com.yzs.wanandroidapp.bean.HomeBean;
 import com.yzs.wanandroidapp.contract.HomeContract;
-import com.yzs.wanandroidapp.http.Api;
 import com.yzs.wanandroidapp.model.HomeModel;
 import com.yzs.wanandroidapp.presenter.HomePresenter;
 import com.yzs.wanandroidapp.utils.GlideImageLoader;
 import com.yzs.yzsbaseactivitylib.entity.BaseListType;
 import com.yzs.yzsbaseactivitylib.util.LoadingDialogUtils;
-import com.yzs.yzsbaseactivitylib.yzsbase.YzsBaseListFragment;
 import com.yzs.yzsbaseactivitylib.yzsbase.YzsBaseMvpListFragment;
-import com.yzs.yzslibrary.util.ConstUtils;
-import com.yzs.yzslibrary.util.LogUtils;
 import com.yzs.yzslibrary.util.TimeUtils;
 import com.yzs.yzslibrary.util.ToastUtils;
 
 import java.text.SimpleDateFormat;
 import java.util.List;
 import java.util.Locale;
 
-import io.reactivex.Observer;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.annotations.NonNull;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.schedulers.Schedulers;
 
 /**
  * Author: 姚智胜
@@ -112,6 +103,12 @@ protected void initLogic() {
         View headView = LayoutInflater.from(_mActivity).inflate(R.layout.layout_head_home, null);
         banner = (Banner) headView.findViewById(R.id.banner_home);
         mAdapter.addHeaderView(headView);
+        mAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter baseQuickAdapter, View view, int i) {
+
+            }
+        });
         autoRefresh();
     }
 
@@ -123,7 +120,7 @@ public boolean showToolBar() {
     /**
      * 详细使用
      */
-    private void bannerUse(List<BannerBean.DataBean> bannerList) {
+    private void initBanner(List<BannerBean.DataBean> bannerList) {
         //设置banner样式
         banner.setBannerStyle(BannerConfig.NUM_INDICATOR);
         //设置图片加载器
@@ -174,14 +171,13 @@ public void showData(HomeBean.DataBean bean) {
 
     @Override
     public void showBanner(List<BannerBean.DataBean> bannerList) {
-        bannerUse(bannerList);
+        initBanner(bannerList);
     }
 
     @Override
     protected void refreshListener() {
         setPage(0);
-        mPresenter.getBannerDataRequest();
-        mPresenter.getDataRequest(getPage());
+        mPresenter.refresh();
     }
 
     @Override
diff --git a/wanandroidapp/src/main/java/com/yzs/wanandroidapp/ui/fragment/home/KnowledgeFragment.java b/wanandroidapp/src/main/java/com/yzs/wanandroidapp/ui/fragment/home/KnowledgeFragment.java
@@ -5,6 +5,8 @@
 
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.yzs.wanandroidapp.R;
+import com.yzs.wanandroidapp.bean.HomeKnowledgeBean;
+import com.yzs.yzsbaseactivitylib.entity.BaseListType;
 import com.yzs.yzsbaseactivitylib.yzsbase.YzsBaseFragment;
 import com.yzs.yzsbaseactivitylib.yzsbase.YzsBaseListFragment;
 
@@ -14,7 +16,7 @@
  * Description: 知识体系fragment
  * Date: 2018/4/20
  */
-public class KnowledgeFragment extends YzsBaseListFragment{
+public class KnowledgeFragment extends YzsBaseListFragment<HomeKnowledgeBean.DataBean> {
 
     public static KnowledgeFragment newInstance() {
 
@@ -26,19 +28,22 @@ public static KnowledgeFragment newInstance() {
 
     @Override
     protected int initItemLayout() {
-        return R.layout.item_home_layout;
+        return R.layout.item_layout_knowledge;
     }
 
     @Override
     protected void initSetting() {
-
+        isOpenLoad(false, false);
+        setListType(BaseListType.LINEAR_LAYOUT_MANAGER, true);//设置展示方式
     }
 
     @Override
-    protected void MyHolder(BaseViewHolder baseViewHolder, Object o) {
+    protected void MyHolder(BaseViewHolder baseViewHolder, HomeKnowledgeBean.DataBean bean) {
+        baseViewHolder.setText(R.id.tv_knowledge_title, bean.getName());
 
     }
 
+
     @Override
     protected void initLogic() {
 
diff --git a/wanandroidapp/src/main/java/com/yzs/wanandroidapp/utils/GlideImageLoader.java b/wanandroidapp/src/main/java/com/yzs/wanandroidapp/utils/GlideImageLoader.java
@@ -26,9 +26,6 @@ public void displayImage(Context context, Object path, ImageView imageView) {
          切记不要胡乱强转！
          */
         BannerBean.DataBean bean = (BannerBean.DataBean) path;
-        LogUtils.e(new Gson().toJson(bean));
-        LogUtils.e("================="+new Gson().toJson(path));
-        LogUtils.e("=======111111=========="+bean.getImagePath());
         //Glide 加载图片简单用法
         Glide.with(context).load(bean.getImagePath()).into(imageView);
 
diff --git a/wanandroidapp/src/main/res/layout/ac_test.xml b/wanandroidapp/src/main/res/layout/ac_test.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <Button
+        android:id="@+id/btn_test"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="start" />
+
+</LinearLayout>
diff --git a/wanandroidapp/src/main/res/layout/item_home_layout.xml b/wanandroidapp/src/main/res/layout/item_home_layout.xml
@@ -3,8 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="120dp"
-    android:layout_marginBottom="5dp"
-    android:layout_marginTop="5dp"
+    android:layout_margin="5dp"
     app:cardCornerRadius="5dp"
     app:cardElevation="5dp">
 
diff --git a/wanandroidapp/src/main/res/layout/item_layout_knowledge.xml b/wanandroidapp/src/main/res/layout/item_layout_knowledge.xml
diff --git a/wanandroidapp/src/main/res/mipmap-xxhdpi/icon_more.png b/wanandroidapp/src/main/res/mipmap-xxhdpi/icon_more.png
diff --git a/wanandroidapp/src/main/res/values/colors.xml b/wanandroidapp/src/main/res/values/colors.xml

Original file line number	Diff line number	Diff line change
`@@ -28,11 +28,14 @@ interface CHomeModel extends BaseModel {`
`28`	`28`	`Observable<HomeBean> requestHomeListData(int page);`
`29`	`29`
`30`	`30`	`Observable<BannerBean> requestBannerData();`
	`31`	`+`
	`32`	`+ Observable<Object> refresh();`
`31`	`33`	`}`
`32`	`34`
`33`	`35`	`abstract static class CHomePresenter extends BasePresenter<CHomeView, CHomeModel> {`
	`36`	`+`
`34`	`37`	`public abstract void getDataRequest(int page);`
`35`	`38`
`36`		`- public abstract void getBannerDataRequest();`
	`39`	`+ public abstract void refresh();`
`37`	`40`	`}`
`38`	`41`	`}`